Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f8dce0b817 | ||
|
|
0eb781a6d3 | ||
|
|
9150550609 | ||
|
|
84abf6b820 | ||
|
|
4904589086 | ||
|
|
6f7e149c9a | ||
|
|
df344b4c13 |
@@ -98,6 +98,7 @@ jobs:
|
|||||||
# 2. Create Directory Structure
|
# 2. Create Directory Structure
|
||||||
mkdir -p $BUILD_DIR/usr/bin
|
mkdir -p $BUILD_DIR/usr/bin
|
||||||
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME
|
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME
|
||||||
|
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/data
|
||||||
mkdir -p $BUILD_DIR/etc/systemd/system
|
mkdir -p $BUILD_DIR/etc/systemd/system
|
||||||
mkdir -p $BUILD_DIR/DEBIAN
|
mkdir -p $BUILD_DIR/DEBIAN
|
||||||
|
|
||||||
@@ -113,23 +114,23 @@ jobs:
|
|||||||
echo "PORT=8080" > $BUILD_DIR/usr/share/$PKG_NAME/.env.template
|
echo "PORT=8080" > $BUILD_DIR/usr/share/$PKG_NAME/.env.template
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 5. Create the systemd Service File
|
# 5. Create a Template Autostart File (Instead of Systemd)
|
||||||
cat <<EOF > $BUILD_DIR/etc/systemd/system/$PKG_NAME.service
|
mkdir -p $BUILD_DIR/usr/share/$PKG_NAME/setup
|
||||||
[Unit]
|
cat <<'EOF' > $BUILD_DIR/usr/share/$PKG_NAME/setup/$PKG_NAME.desktop
|
||||||
Description=Slideshow Application Service
|
[Desktop Entry]
|
||||||
After=graphical.target
|
Type=Application
|
||||||
|
Name=Slideshow App
|
||||||
[Service]
|
Exec=sh -c ' \
|
||||||
Type=simple
|
i=0; \
|
||||||
Environment=DISPLAY=:0
|
while [ $i -lt 30 ]; do \
|
||||||
Environment=XAUTHORITY=/home/youruser/.Xauthority
|
if [ "$(ls -A /media/$USER 2>/dev/null)" ] && ping -c 1 -W 1 8.8.8.8 >/dev/null 2>&1; then \
|
||||||
ExecStart=/usr/bin/$PKG_NAME
|
break; \
|
||||||
WorkingDirectory=/usr/share/$PKG_NAME
|
fi; \
|
||||||
Restart=always
|
i=$((i+1)); \
|
||||||
User=root
|
sleep 1; \
|
||||||
|
done; \
|
||||||
[Install]
|
cd /usr/share/slideshowapp && /usr/bin/slideshowapp'
|
||||||
WantedBy=multi-user.target
|
Terminal=false
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# 6. Create Control File
|
# 6. Create Control File
|
||||||
@@ -139,28 +140,64 @@ jobs:
|
|||||||
Section: utils
|
Section: utils
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Architecture: $ARCH
|
Architecture: $ARCH
|
||||||
Maintainer: Your Name <you@example.com>
|
Maintainer: Adrian Zuercher <zuercher@tecamino.ch>
|
||||||
Description: Slideshow Application
|
Description: Slideshow Application
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# 7. Optional: Add post-install script to enable service automatically
|
# 7. Add post-install script for Autostart and Permissions
|
||||||
echo "create service"
|
cat <<'EOF' > $BUILD_DIR/DEBIAN/postinst
|
||||||
cat <<EOF > $BUILD_DIR/DEBIAN/postinst
|
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Check if .env exists in the target share folder
|
set -e # Exit on error
|
||||||
if [ ! -f "/usr/share/$PKG_NAME/.env" ]; then
|
|
||||||
echo "Creating new .env from template..."
|
# 1. Detect the real user
|
||||||
cp /usr/share/$PKG_NAME/.env.template /usr/share/$PKG_NAME/.env
|
# We use 'who' and 'awk' as a fallback because $SUDO_USER is sometimes empty in Gitea/CI environments
|
||||||
else
|
REAL_USER=${SUDO_USER:-$(who | awk '{print $1}' | head -n1)}
|
||||||
echo ".env already exists, skipping template copy to preserve settings."
|
|
||||||
|
# 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
|
||||||
|
|
||||||
echo "reload"
|
USER_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||||
systemctl daemon-reload
|
|
||||||
echo "enable service"
|
echo "Setting permissions for /usr/share/slideshowapp..."
|
||||||
systemctl enable $PKG_NAME.service
|
chown -R "$REAL_USER:$REAL_USER" /usr/share/slideshowapp
|
||||||
echo "start service"
|
chmod -R 755 /usr/share/slideshowapp
|
||||||
systemctl start $PKG_NAME.service
|
|
||||||
|
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
|
||||||
|
echo "Creating .env from template..."
|
||||||
|
cp /usr/share/slideshowapp/env.template /usr/share/slideshowapp/.env || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 3. Setup Autostart
|
||||||
|
# We use -p to ensure parent directories exist and set ownership immediately
|
||||||
|
AUTOSTART_DIR="$USER_HOME/.config/autostart"
|
||||||
|
|
||||||
|
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/"
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# 4. Fix Chromium Profile Permissions
|
||||||
|
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."
|
||||||
EOF
|
EOF
|
||||||
chmod 555 $BUILD_DIR/DEBIAN/postinst
|
chmod 555 $BUILD_DIR/DEBIAN/postinst
|
||||||
|
|
||||||
|
|||||||
@@ -4,20 +4,36 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
"slideshowApp/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Schedule map[string]interface{}
|
var scheduleFile = "./data/schedule.json"
|
||||||
|
|
||||||
|
type Schedule map[string]any
|
||||||
|
|
||||||
func SaveSchedule(w http.ResponseWriter, r *http.Request) {
|
func SaveSchedule(w http.ResponseWriter, r *http.Request) {
|
||||||
var s Schedule
|
var s Schedule
|
||||||
json.NewDecoder(r.Body).Decode(&s)
|
if err := json.NewDecoder(r.Body).Decode(&s); err != nil {
|
||||||
data, _ := json.Marshal(s)
|
utils.SendJSONError(w, "Invalid input", http.StatusBadRequest)
|
||||||
os.WriteFile("schedule.json", data, 0644)
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := json.MarshalIndent(s, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
utils.SendJSONError(w, "Encoding failed", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = os.WriteFile(scheduleFile, data, 0644)
|
||||||
|
if err != nil {
|
||||||
|
utils.SendJSONError(w, "write file failed", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetSchedule(w http.ResponseWriter, r *http.Request) {
|
func GetSchedule(w http.ResponseWriter, r *http.Request) {
|
||||||
data, err := os.ReadFile("schedule.json")
|
data, err := os.ReadFile(scheduleFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
json.NewEncoder(w).Encode(Schedule{})
|
json.NewEncoder(w).Encode(Schedule{})
|
||||||
return
|
return
|
||||||
|
|||||||
12
utils/http.go
Normal file
12
utils/http.go
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
package utils
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
func SendJSONError(w http.ResponseWriter, message string, code int) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(code)
|
||||||
|
json.NewEncoder(w).Encode(map[string]string{"error": message})
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user