From ee4fd33e72a119b0deb01c198646bc4aa214b693 Mon Sep 17 00:00:00 2001 From: "Josh.5" Date: Tue, 22 Aug 2023 15:55:21 +1200 Subject: [PATCH] Move app install scripts to /usr/bin --- overlay/entrypoint.sh | 3 --- overlay/{opt/scripts => usr/bin}/drop_caches.sh | 0 overlay/{opt/scripts => usr/bin}/install_firefox.sh | 0 overlay/{opt/scripts => usr/bin}/install_protonup.sh | 0 overlay/{opt/scripts => usr/bin}/install_sunshine.sh | 0 overlay/usr/bin/start-desktop.sh | 6 +++--- 6 files changed, 3 insertions(+), 6 deletions(-) rename overlay/{opt/scripts => usr/bin}/drop_caches.sh (100%) rename overlay/{opt/scripts => usr/bin}/install_firefox.sh (100%) rename overlay/{opt/scripts => usr/bin}/install_protonup.sh (100%) rename overlay/{opt/scripts => usr/bin}/install_sunshine.sh (100%) diff --git a/overlay/entrypoint.sh b/overlay/entrypoint.sh index 928bf89..867edb7 100644 --- a/overlay/entrypoint.sh +++ b/overlay/entrypoint.sh @@ -52,9 +52,6 @@ for user_init_script in ${USER_HOME}/init.d/*.sh ; do done -# Ensure all scripts are executable -chmod a+rwx /opt/scripts/*.sh - # Start supervisord echo echo "**** Starting supervisord ****"; diff --git a/overlay/opt/scripts/drop_caches.sh b/overlay/usr/bin/drop_caches.sh similarity index 100% rename from overlay/opt/scripts/drop_caches.sh rename to overlay/usr/bin/drop_caches.sh diff --git a/overlay/opt/scripts/install_firefox.sh b/overlay/usr/bin/install_firefox.sh similarity index 100% rename from overlay/opt/scripts/install_firefox.sh rename to overlay/usr/bin/install_firefox.sh diff --git a/overlay/opt/scripts/install_protonup.sh b/overlay/usr/bin/install_protonup.sh similarity index 100% rename from overlay/opt/scripts/install_protonup.sh rename to overlay/usr/bin/install_protonup.sh diff --git a/overlay/opt/scripts/install_sunshine.sh b/overlay/usr/bin/install_sunshine.sh similarity index 100% rename from overlay/opt/scripts/install_sunshine.sh rename to overlay/usr/bin/install_sunshine.sh diff --git a/overlay/usr/bin/start-desktop.sh b/overlay/usr/bin/start-desktop.sh index 7270f3f..a86505a 100755 --- a/overlay/usr/bin/start-desktop.sh +++ b/overlay/usr/bin/start-desktop.sh @@ -28,9 +28,9 @@ wait_for_x # Install/Upgrade user apps if [[ ! -f /tmp/.desktop-apps-updated.lock ]]; then xterm -geometry 200x50+0+0 -ls -e /bin/bash -c " - source /opt/scripts/install_firefox.sh; - source /opt/scripts/install_protonup.sh; - source /opt/scripts/install_sunshine.sh; + source /usr/bin/install_firefox.sh; + source /usr/bin/install_protonup.sh; + source /usr/bin/install_sunshine.sh; sleep 1; " touch /tmp/.desktop-apps-updated.lock