change appname constant to variable
All checks were successful
Build Slideshow App / build (amd64, .exe, windows) (push) Successful in 1m58s
Build Slideshow App / build (amd64, , linux) (push) Successful in 2m16s
Build Slideshow App / build (arm, 7, , linux) (push) Successful in 1m54s
Build Slideshow App / build (arm64, , linux) (push) Successful in 1m56s

This commit is contained in:
Adrian Zürcher
2026-02-03 11:28:08 +01:00
parent aa900d5e3b
commit 46a56e130f
2 changed files with 11 additions and 10 deletions

View File

@@ -92,7 +92,7 @@ jobs:
ARCH=${{ matrix.arch }}
if [ "$ARCH" == "arm" ]; then ARCH="armhf"; fi
PKG_NAME="slideshowapp"
PKG_NAME="${APP_NAME}"
BUILD_DIR="${PKG_NAME}_${VERSION}_${ARCH}"
# 2. Create Directory Structure
@@ -120,7 +120,7 @@ jobs:
[Desktop Entry]
Type=Application
Name=Slideshow App
Exec=sh -c 'i=0; while [ $i -lt 30 ]; do if [ "$(ls -A /media/$USER 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then break; fi; i=$((i+1)); sleep 1; done; cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
Exec=sh -c 'i=0; while [ $i -lt 30 ]; do if [ "$(ls -A /media/$USER 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then break; fi; i=$((i+1)); sleep 1; done; cd /usr/share/$PKG_NAME && /usr/bin/$PKG_NAME'
Terminal=false
EOF
@@ -151,17 +151,17 @@ jobs:
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
echo "Setting permissions for /usr/share/slideshowapp..."
chown -R "$REAL_USER:$REAL_USER" /usr/share/slideshowapp
chmod -R 755 /usr/share/slideshowapp
echo "Setting permissions for /usr/share/$PKG_NAME..."
chown -R "$REAL_USER:$REAL_USER" /usr/share/$PKG_NAME
chmod -R 755 /usr/share/$PKG_NAME
echo "Post-install: Target user is $REAL_USER"
echo "Post-install: Target home is $USER_HOME"
# 2. Setup .env from template
if [ ! -f "/usr/share/slideshowapp/.env" ]; then
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
echo "Creating .env from template..."
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
cp /usr/share/$PKG_NAME/env.template /usr/share/$PKG_NAME/.env || true
fi
# 3. Setup Autostart
@@ -171,11 +171,11 @@ jobs:
if [ -d "$USER_HOME" ]; then
echo "Creating autostart directory at $AUTOSTART_DIR"
mkdir -p "$AUTOSTART_DIR"
cp /usr/share/slideshowapp/setup/slideshowapp.desktop "$AUTOSTART_DIR/"
cp /usr/share/$PKG_NAME/setup/$PKG_NAME.desktop "$AUTOSTART_DIR/"
# Critical: Change ownership of the folder and the file
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config"
chmod 644 "$AUTOSTART_DIR/slideshowapp.desktop"
chmod 644 "$AUTOSTART_DIR/$PKG_NAME.desktop"
else
echo "ERROR: Home directory $USER_HOME not found. Autostart not configured."
fi

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@ images/
slideshowApp
schedule.json
*.log
*.exe