Merge branch 'string_to_checkbox' into 'master'

Rewrite the two last scripts to use checkboxes for "Activate", relocate a few scripts to "udfases"

See merge request os2borgerpc/os2borgerpc-scripts!245

Author: Marcus Funch

os2borgerpc/sikkerhed/desktop_persistent_dir.sh

@@ -5,22 +5,15 @@
 #
 # Arguments
 #   1: Whether to add or remove the shared dir
-#      'yes' adds, 'no' removes
+#      'True' adds, 'False' removes
 #   2: The name of the shared dir to add or remove
-#
-# Author: [email protected]
-# Credits: [email protected]
 
 if get_os2borgerpc_config os2_product | grep --quiet kiosk; then
   echo "Dette script er ikke designet til at blive anvendt på en kiosk-maskine."
   exit 1
 fi
 
-lower() {
-    echo "$@" | tr '[:upper:]' '[:lower:]'
-}
-
-ACTIVATE="$(lower "$1")"
+ACTIVATE="$1"
 NAME="$2"
 
 DIR=/var/local/$NAME
@@ -36,11 +29,9 @@ export "$(grep LANG= /etc/default/locale | tr -d '"')"
 runuser -u user xdg-user-dirs-update
 DESKTOP=$(basename "$(runuser -u $USERNAME xdg-user-dir DESKTOP)")
 
-if [ "$ACTIVATE" != 'false' ] && [ "$ACTIVATE" != 'falsk' ] && \
-   [ "$ACTIVATE" != 'no' ] && [ "$ACTIVATE" != 'nej' ]; then
+if [ "$ACTIVATE" = "True" ]; then
 
-  mkdir --parents "$DIR"
-  mkdir --parents "/home/$SHADOW/$DESKTOP"
+  mkdir --parents "$DIR" "/home/$SHADOW/$DESKTOP"
   chown $USERNAME:$USERNAME "$DIR"
   ln --symbolic "$DIR" "/home/$SHADOW/$DESKTOP/$NAME"
 

os2borgerpc/login/lightdm_greeter_setup_scripts.sh renamed to os2borgerpc/udfases/lightdm_greeter_setup_scripts.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env sh
 
-lower() {
-    echo "$@" | tr '[:upper:]' '[:lower:]'
-}
-
-ACTIVATE="$(lower "$1")"
+ACTIVATE="$1"
 
 export DEBIAN_FRONTEND=noninteractive
 FILE="/home/chrome/.xinitrc"
@@ -17,8 +13,7 @@ fi
 
 apt-get update --assume-yes
 
-if [ "$ACTIVATE" != 'false' ] && [ "$ACTIVATE" != 'falsk' ] && \
-   [ "$ACTIVATE" != 'no' ] && [ "$ACTIVATE" != 'nej' ]; then
+if [ "$ACTIVATE" = "True" ]; then
 
   apt-get install --assume-yes $PROGRAM