Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4904589086 | ||
|
|
6f7e149c9a |
@@ -119,8 +119,16 @@ jobs:
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name=Slideshow App
|
Name=Slideshow App
|
||||||
Exec=/usr/bin/$PKG_NAME
|
Exec=sh -c ' \
|
||||||
WorkingDirectory=/usr/share/$PKG_NAME
|
i=0; \
|
||||||
|
while [ $i -lt 30 ]; do \
|
||||||
|
if [ "$(ls -A "/media/$REAL_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'
|
||||||
Terminal=false
|
Terminal=false
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@@ -136,39 +144,55 @@ jobs:
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
# 7. Add post-install script for Autostart and Permissions
|
# 7. Add post-install script for Autostart and Permissions
|
||||||
cat <<EOF > $BUILD_DIR/DEBIAN/postinst
|
cat <<'EOF' > $BUILD_DIR/DEBIAN/postinst
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# 1. Detect the real user (the one who ran sudo)
|
set -e # Exit on error
|
||||||
REAL_USER=\$SUDO_USER
|
|
||||||
if [ -z "\$REAL_USER" ]; then
|
# 1. Detect the real user
|
||||||
REAL_USER=\$(logname 2>/dev/null || echo "pi")
|
# We use 'who' and 'awk' as a fallback because $SUDO_USER is sometimes empty in Gitea/CI environments
|
||||||
|
REAL_USER=${SUDO_USER:-$(who | awk '{print $1}' | head -n1)}
|
||||||
|
|
||||||
|
# If still empty, default to 'mst' or 'pi' (adjust to your primary user)
|
||||||
|
if [ -z "$REAL_USER" ] || [ "$REAL_USER" = "root" ]; then
|
||||||
|
REAL_USER="mst"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
USER_HOME=\$(getent passwd "\$REAL_USER" | cut -d: -f6)
|
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||||
|
|
||||||
echo "Installing for user: \$REAL_USER in \$USER_HOME"
|
echo "Post-install: Target user is $REAL_USER"
|
||||||
|
echo "Post-install: Target home is $USER_HOME"
|
||||||
|
|
||||||
# 2. Setup .env from template
|
# 2. Setup .env from template
|
||||||
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
|
if [ ! -f "/usr/share/slideshowapp/.env" ]; then
|
||||||
cp /usr/share/$PKG_NAME/.env.template /usr/share/$PKG_NAME/.env
|
echo "Creating .env from template..."
|
||||||
|
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. Setup Autostart for the graphical desktop
|
# 3. Setup Autostart (THE FIX)
|
||||||
AUTOSTART_DIR="\$USER_HOME/.config/autostart"
|
# We use -p to ensure parent directories exist and set ownership immediately
|
||||||
mkdir -p "\$AUTOSTART_DIR"
|
AUTOSTART_DIR="$USER_HOME/.config/autostart"
|
||||||
cp /usr/share/$PKG_NAME/setup/$PKG_NAME.desktop "\$AUTOSTART_DIR/"
|
|
||||||
|
|
||||||
# 4. Fix Chromium Profile Permissions (Resolves the 'Profile Error')
|
if [ -d "$USER_HOME" ]; then
|
||||||
# This ensures the standard user can write to their own config
|
echo "Creating autostart directory at $AUTOSTART_DIR"
|
||||||
if [ -d "\$USER_HOME/.config/chromium" ]; then
|
mkdir -p "$AUTOSTART_DIR"
|
||||||
chown -R \$REAL_USER:\$REAL_USER "\$USER_HOME/.config/chromium"
|
cp /usr/share/slideshowapp/setup/slideshowapp.desktop "$AUTOSTART_DIR/"
|
||||||
rm -f "\$USER_HOME/.config/chromium/SingletonLock"
|
|
||||||
|
# Critical: Change ownership of the folder and the file
|
||||||
|
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config"
|
||||||
|
chmod 644 "$AUTOSTART_DIR/slideshowapp.desktop"
|
||||||
|
else
|
||||||
|
echo "ERROR: Home directory $USER_HOME not found. Autostart not configured."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 5. Set correct ownership for the autostart file
|
# 4. Fix Chromium Profile Permissions
|
||||||
chown -R \$REAL_USER:\$REAL_USER "\$AUTOSTART_DIR/$PKG_NAME.desktop"
|
if [ -d "$USER_HOME/.config/chromium" ]; then
|
||||||
|
echo "Cleaning up Chromium locks for $REAL_USER..."
|
||||||
|
chown -R "$REAL_USER:$REAL_USER" "$USER_HOME/.config/chromium"
|
||||||
|
rm -f "$USER_HOME/.config/chromium/SingletonLock"
|
||||||
|
rm -f "$USER_HOME/.config/chromium/SingletonCookie"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Installation complete. The app will start on the next Desktop login."
|
echo "Installation complete."
|
||||||
EOF
|
EOF
|
||||||
chmod 555 $BUILD_DIR/DEBIAN/postinst
|
chmod 555 $BUILD_DIR/DEBIAN/postinst
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user