From ee7896183a0e457c595ba1ed34875e4a3d6088ed Mon Sep 17 00:00:00 2001 From: Guy Sheffer Date: Thu, 2 Jan 2025 11:18:26 +0200 Subject: [PATCH] Fix typo in gui placeholder string --- src/modules/admin-toolkit/start_chroot_script | 6 +++--- src/modules/gui/end_chroot_script | 2 +- src/modules/gui/filesystem/opt/scripts/start_gui | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/admin-toolkit/start_chroot_script b/src/modules/admin-toolkit/start_chroot_script index b0b870a5..ad909d58 100644 --- a/src/modules/admin-toolkit/start_chroot_script +++ b/src/modules/admin-toolkit/start_chroot_script @@ -170,10 +170,10 @@ if [ "$ADMIN_TOOLKIT_SCREEN_ROTATION" != "normal" ] then # Handle rotation if the gui module closes after this module echo "Adding screen rotation..." - if grep -q "GUI_SESSION_PLACEHOLDEFR" /home/pi/scripts/start_gui ; then - sed -i /home/pi/scripts/start_gui -e "s/^GUI_SESSION_PLACEHOLDEFR/export DISPLAY=:0/" + if grep -q "GUI_SESSION_PLACEHOLDER" /home/pi/scripts/start_gui ; then + sed -i /home/pi/scripts/start_gui -e "s/^GUI_SESSION_PLACEHOLDER/export DISPLAY=:0/" echo "/home/pi/scripts/rotate.sh $ADMIN_TOOLKIT_SCREEN_ROTATION" >> /home/pi/scripts/start_gui - echo 'GUI_SESSION_PLACEHOLDEFR' >> /home/pi/scripts/start_gui + echo 'GUI_SESSION_PLACEHOLDER' >> /home/pi/scripts/start_gui elif grep -q "/home/pi/scripts/run_onepageos" /home/pi/scripts/start_gui ; then sed -i /home/pi/scripts/start_gui -e "s/^\/home\/pi\/scripts\/run_onepageos/export DISPLAY=:0/" echo "/home/pi/scripts/rotate.sh $ADMIN_TOOLKIT_SCREEN_ROTATION" >> /home/pi/scripts/start_gui diff --git a/src/modules/gui/end_chroot_script b/src/modules/gui/end_chroot_script index 463252f0..aa9ac374 100755 --- a/src/modules/gui/end_chroot_script +++ b/src/modules/gui/end_chroot_script @@ -21,7 +21,7 @@ if [ "${BASE_DISTRO}" == "raspbian" ] || [ "${BASE_DISTRO}" == "raspios64" ] || fi # set the gui to run the main script of the GUI session -sed -i "s@GUI_SESSION_PLACEHOLDEFR@${GUI_STARTUP_SCRIPT}@g" /opt/custompios/scripts/start_gui +sed -i "s@GUI_SESSION_PLACEHOLDER@${GUI_STARTUP_SCRIPT}@g" /opt/custompios/scripts/start_gui # Set the boot target to use a gui systemctl set-default graphical.target diff --git a/src/modules/gui/filesystem/opt/scripts/start_gui b/src/modules/gui/filesystem/opt/scripts/start_gui index 25f7f62d..8829c81c 100755 --- a/src/modules/gui/filesystem/opt/scripts/start_gui +++ b/src/modules/gui/filesystem/opt/scripts/start_gui @@ -20,4 +20,4 @@ fi matchbox-window-manager & -GUI_SESSION_PLACEHOLDEFR +GUI_SESSION_PLACEHOLDER