Merge branch 'feature/56040_correct_error_in_scripts_with_language_variability' into 'master'

Correct error in scripts with language variability

See merge request os2borgerpc/os2borgerpc-scripts!217

Author: Andreas Poulsen

common/fejlfinding/os2borgerpc_general_debug.sh

@@ -20,7 +20,7 @@ text() {
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 

os2borgerpc/chrome/chrome_install.sh

@@ -68,7 +68,7 @@ DESKTOP_FILE_PATH_1=/usr/share/applications/google-chrome.desktop
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 DESKTOP_FILE_PATH_2=/home/$USER/$DESKTOP/google-chrome.desktop

os2borgerpc/chrome/chrome_start_maximized_fullscreen_kiosk.sh

@@ -34,7 +34,7 @@ DESKTOP_FILE_1=/usr/share/applications/google-chrome.desktop
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 DESKTOP_FILE_2=/home/$USER/$DESKTOP/google-chrome.desktop

os2borgerpc/desktop/desktop_activate_shortcuts.sh

@@ -47,7 +47,7 @@ cat << EOF > "$GIO_LAUNCHER"
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export \$(grep LANG= /etc/default/locale)
+export \$(grep LANG= /etc/default/locale | tr -d '"')
 runuser -u user xdg-user-dirs-update
 DESKTOP=\$(runuser -u $USERNAME xdg-user-dir DESKTOP)
 

os2borgerpc/desktop/desktop_logout_button_icon.sh

@@ -23,7 +23,7 @@ ICON_UPLOAD="$4"
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 

os2borgerpc/desktop/desktop_print_program_list.sh

@@ -29,7 +29,7 @@ LOCATION="$(lower "$1")"
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 SHADOW_DESKTOP=/home/.skjult/$DESKTOP

os2borgerpc/desktop/desktop_program_shortcut.sh

@@ -26,7 +26,7 @@ fi
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 

os2borgerpc/desktop/desktop_shortcut_to_directory.sh

@@ -23,7 +23,7 @@ SHORTCUT_NAME="$3"
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 

os2borgerpc/desktop/desktop_url_shortcut.sh

@@ -30,7 +30,7 @@ ICON_UPLOAD="$4"
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u user xdg-user-dir DESKTOP)")
 

os2borgerpc/sikkerhed/desktop_persistent_dir.sh

@@ -32,7 +32,7 @@ SHADOW=.skjult
 # we run xdg-user-dirs-update, which generates it based on the environment variable
 # LANG. This variable is empty in lightdm so we first export it
 # based on the value stored in /etc/default/locale
-export "$(grep LANG= /etc/default/locale)"
+export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u $USERNAME xdg-user-dir DESKTOP)")