Merge branch '61225/update_scripts_to_choice' into 'master'

updated the scripts to use choices

See merge request os2borgerpc/os2borgerpc-scripts!368

Author: Sebastian Heiberg

os2borgerpc/browser/browser_set_default.sh

@@ -12,20 +12,18 @@ if get_os2borgerpc_config os2_product | grep --quiet kiosk; then
   exit 1
 fi
 
+# Expected browsers are either firefox, google-chrome, microsoft-edge
+BROWSER=$1
+ALTERNATIVE_BROWSER=$2
+FILE="/etc/xdg/mimeapps.list"
+
 lower() {
     echo "$@" | tr '[:upper:]' '[:lower:]'
 }
 
-BROWSER="$(lower "$1")"
-
-FILE="/etc/xdg/mimeapps.list"
-
-# They can type in "chrome" but the desktop file is called google-chrome
-# They can type in "edge" but the desktop file is called microsoft-edge
-if [ "$BROWSER" = "chrome" ]; then
-  BROWSER=google-chrome
-elif [ "$BROWSER" = "edge" ]; then
-  BROWSER=microsoft-edge
+# If the alternative browser is set, use that instead
+if [ -n "$ALTERNATIVE_BROWSER" ]; then
+  BROWSER=$(lower "$ALTERNATIVE_BROWSER")
 fi
 
 # Handle snaps, which have names like firefox_firefox.desktop

os2borgerpc/browser/browser_update_launcher.sh

@@ -9,15 +9,6 @@ TARGET_BROWSER=$1
 
 DCONF_POLICY="/etc/dconf/db/os2borgerpc.d/02-launcher-favorites"
 
-# This check is here so they can't end up in a situation where the default browser is set to something invalid, and its
-# now impossible to fix it via this script because what's replaced is hardcoded
-if [ "$TARGET_BROWSER" != "firefox" ] \
-  && [ "$TARGET_BROWSER" != "google-chrome" ] \
-  && [ "$TARGET_BROWSER" != "microsoft-edge" ] \
-  && [ "$TARGET_BROWSER" != "chromium" ]; then
-  echo "Requested browser - $TARGET_BROWSER - is not a valid option. See the script description for valid options."
-  exit 1
-fi
 
 # In 22.04 Firefox is a snap, in 20.04 it's an apt package.
 # Once everyone has upgraded, support for the latter can be removed

os2borgerpc/browser/chrome_chromium_incognito_enforce.sh

@@ -14,19 +14,15 @@ INPUT_MODE=$2
 POLICY="/etc/opt/chrome/policies/managed/os2borgerpc-enforce-incognito.json"
 
 case $INPUT_MODE in
-0)
+"Incognito mode available")
     INCOGNITO_MODE=0
     ;;
-1)
+"Incognito mode disabled")
     INCOGNITO_MODE=1
     ;;
-2)
+"Incognito mode forced")
     INCOGNITO_MODE=2
     ;;
-*)
-    echo "$INPUT_MODE IS NOT a valid option. Exiting ..."
-    exit 1
-    ;;
 esac
 
 

os2borgerpc/browser/chrome_chromium_start_maximized_fullscreen_kiosk.sh

@@ -7,10 +7,10 @@
 #
 # Arguments:
 # 1:
-#   0: Disable all three (default)
-#   1: Maximized
-#   2: Full screen
-#   3: Kiosk
+#   Disable
+#   Maximized
+#   Fullscreen
+#   Kiosk
 #
 # Takes effect after logout / restart.
 #
@@ -98,44 +98,22 @@ if [ -f $OLD_DESKTOP_FILE ]; then
   exit 1
 fi
 
-case "$SETTING" in
-  0) # Disable all three
-    # shellcheck disable=SC2086 # We want to split the files back into separate arguments
-    remove_from_desktop_files "--start-maximized" $FILES
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--start-fullscreen" $FILES
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--kiosk" $FILES
-    ;;
-  1) # MAXIMIZE
-    # shellcheck disable=SC2086
-    add_to_desktop_files "--start-maximized" $FILES
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--start-fullscreen" $FILES
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--kiosk" $FILES
-    ;;
-  2) # FULLSCREEN
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--start-maximized" $FILES
-    # shellcheck disable=SC2086
-    add_to_desktop_files "--start-fullscreen" $FILES
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--kiosk" $FILES
-    ;;
-  3) # KIOSK
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--start-maximized" $FILES
-    # shellcheck disable=SC2086
-    remove_from_desktop_files "--start-fullscreen" $FILES
-    # shellcheck disable=SC2086
-    add_to_desktop_files "--kiosk" $FILES
-    ;;
-  *)
-    printf "%s" "Invalid parameter: It needs to be either 0 (all disabled), 1 (maximized), 2 (full screen) or 3 (kiosk)."
-    exit 1
-    ;;
-esac
+# Removes the old settings
+# shellcheck disable=SC2086
+remove_from_desktop_files "--start-maximized" $FILES
+# shellcheck disable=SC2086
+remove_from_desktop_files "--start-fullscreen" $FILES
+# shellcheck disable=SC2086
+remove_from_desktop_files "--kiosk" $FILES
+
+# Setting the new setting, disable is handled above
+if [ "$SETTING" = "maximized" ] || [ "$SETTING" = "fullscreen" ]; then
+  # shellcheck disable=SC2086
+  add_to_desktop_files "--start-$SETTING" $FILES
+elif [ "$SETTING" = "kiosk" ]; then
+  # shellcheck disable=SC2086
+  add_to_desktop_files "--$SETTING" $FILES
+fi
 
 echo "For the changes to Chromium to take effect waiting a few seconds should be enough."
 echo "For the changes to Chrome to take effect, you must logout and login again."

os2borgerpc/printer/printer_options_set.sh

@@ -43,11 +43,21 @@ fi
 if [ -n "$ORIENTATION" ]; then
     # Mapping the requested orientation to the number CUPS expect, which for some reason is 3-indexed.
     # Available orientations: https://www.cups.org/doc/options.html#ORIENTATION
-    ORIENTATION=$((ORIENTATION + 3))
-    if ! echo $ORIENTATION | grep --quiet "[3-6]"; then
-        echo "Invalid orientation. Exiting."
-        exit 1
-    fi
+
+    case $ORIENTATION in
+    "Portrait")
+        ORIENTATION="3"
+        ;;
+    "Landscape")
+        ORIENTATION="4"
+        ;;
+    "Reverse landscape")
+        ORIENTATION="5"
+        ;;
+    "Reverse portrait")
+        ORIENTATION="6"
+        ;;
+    esac
 
     # NOTE: This currently sets the orientation for ALL connected printers, which may not be ideal in all situations.
     # printers.conf says to not edit it while CUPS is running, so stop it first