docs: Add 2, update 5 and remove 1 files
All checks were successful
Test and Publish Templates / test-and-publish (push) Successful in 45s
All checks were successful
Test and Publish Templates / test-and-publish (push) Successful in 45s
This commit is contained in:
@@ -15,14 +15,63 @@ fi
|
||||
|
||||
_check_docker_installed || _die "Docker test failed, aborting installation..."
|
||||
|
||||
echo "Installing Squash Display kiosk service..."
|
||||
# Detect system type
|
||||
echo "Detecting system type..."
|
||||
SYSTEM_TYPE=""
|
||||
if [ -f "/proc/device-tree/model" ]; then
|
||||
MODEL=$(cat /proc/device-tree/model 2>/dev/null | tr -d '\0')
|
||||
if echo "$MODEL" | grep -qi "raspberry"; then
|
||||
SYSTEM_TYPE="rpi"
|
||||
echo " Detected: Raspberry Pi ($MODEL)"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$SYSTEM_TYPE" ]; then
|
||||
# Check for Ubuntu on x86_64 (likely Mac Mini or standard PC)
|
||||
if [ -f "/etc/os-release" ]; then
|
||||
. /etc/os-release
|
||||
if [ "$ID" = "ubuntu" ] && [ "$(uname -m)" = "x86_64" ]; then
|
||||
SYSTEM_TYPE="ubuntu"
|
||||
echo " Detected: Ubuntu on x86_64"
|
||||
# Try to detect if it's a Mac Mini
|
||||
if command -v dmidecode >/dev/null 2>&1; then
|
||||
PRODUCT=$(sudo dmidecode -s system-product-name 2>/dev/null || true)
|
||||
if echo "$PRODUCT" | grep -qi "mac"; then
|
||||
echo " Hardware: Mac Mini"
|
||||
fi
|
||||
fi
|
||||
elif [ "$ID" = "raspbian" ] || [ "$ID" = "debian" ] && [ "$(uname -m)" = "aarch64" -o "$(uname -m)" = "armv7l" ]; then
|
||||
SYSTEM_TYPE="rpi"
|
||||
echo " Detected: Raspberry Pi OS"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$SYSTEM_TYPE" ]; then
|
||||
echo " Could not auto-detect system type."
|
||||
echo " Please select your system:"
|
||||
echo " 1) Raspberry Pi"
|
||||
echo " 2) Ubuntu (x86_64/Mac Mini)"
|
||||
read -p " Enter choice (1 or 2): " choice
|
||||
case $choice in
|
||||
1) SYSTEM_TYPE="rpi" ;;
|
||||
2) SYSTEM_TYPE="ubuntu" ;;
|
||||
*) _die "Invalid choice. Installation cancelled." ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Installing Squash Display kiosk service for $SYSTEM_TYPE..."
|
||||
echo ""
|
||||
echo "WARNING: This will make system-level changes to configure kiosk mode."
|
||||
echo "Changes include:"
|
||||
echo " - Installing Chromium browser and X server packages"
|
||||
echo " - Configuring auto-login for user: ${KIOSK_USER}"
|
||||
echo " - Setting up kiosk scripts"
|
||||
echo " - Disabling automatic updates"
|
||||
if [ "$SYSTEM_TYPE" = "rpi" ]; then
|
||||
echo " - Configuring GPU memory allocation"
|
||||
echo " - Disabling automatic updates"
|
||||
fi
|
||||
echo " - Configuring display settings"
|
||||
echo ""
|
||||
|
||||
@@ -47,6 +96,9 @@ if _is_container_exists "$CONTAINER_NAME"; then
|
||||
_remove_container "$CONTAINER_NAME" || true
|
||||
fi
|
||||
|
||||
# Export SYSTEM_TYPE for use in start.sh
|
||||
export SYSTEM_TYPE
|
||||
|
||||
# Start the setup container (scripts are now embedded in start.sh)
|
||||
bash ./start.sh || _die "Failed to start Squash Display setup"
|
||||
|
||||
|
Reference in New Issue
Block a user