Make desktop program list script list snaps

Fix minor error in browser_set_default.sh

Minor documentation update

Author: mf-fx

os2borgerpc/chrome/chrome_replace_firefox_in_launcher.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# 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
 if [ -d "/snap/firefox" ]; then
   sed -i "s/firefox_firefox/google-chrome/" /etc/dconf/db/os2borgerpc.d/02-launcher-favorites
 else

os2borgerpc/desktop/desktop_print_program_list.sh

@@ -4,28 +4,34 @@
 # Author: [email protected]
 #
 # Arguments
-# 1: Default is to print programs available. Write 'skrivebord' to print
-# programs already on the desktop.
+# 1: Default is to print programs available/installed. Write 'skrivebord' to list
+#    programs already on the desktop, or "menu" to list programs in the launcher.
 
 lower() {
     echo "$@" | tr '[:upper:]' '[:lower:]'
 }
 
-DESKTOP="$(lower "$1")"
+find_desktop_files_path() {
+  PTH_LOCAL=$1
+  # - shellcheck says find handles non-alphanumeric file names better than ls
+  find "$PTH_LOCAL" -maxdepth 1 | grep --fixed-strings .desktop | xargs basename --suffix .desktop
+}
+
+LOCATION="$(lower "$1")"
 
-USER=user
+SHADOW_DESKTOP=/home/.skjult/Skrivebord
+SNAP_DESKTOP_FILE_PATH="/var/lib/snapd/desktop/applications"
+APT_DESKTOP_FILE_PATH="/usr/share/applications"
 
-if [ "$DESKTOP" = "menu" ];
-then
+if [ "$LOCATION" = "menu" ]; then
   # Print only the last line only and format it a bit more nicely
   tail -n 1 /etc/dconf/db/os2borgerpc.d/02-launcher-favorites | sed "s/favorite-apps=\[\|'\|\]\ \|.desktop//g" | tr ',' '\n'
   exit
-elif [ "$DESKTOP" = "skrivebord" ]
-then
-  PTH="/home/$USER/Skrivebord/"
+elif [ "$LOCATION" = "skrivebord" ]; then
+  PTH="$SHADOW_DESKTOP/"
 else
-  PTH=/usr/share/applications/
+  PTH=$APT_DESKTOP_FILE_PATH/
+  find_desktop_files_path $SNAP_DESKTOP_FILE_PATH
 fi
 
-# - shellcheck says find handles non-alphanumeric file names better than ls
-find $PTH -maxdepth 1 | sed "s,$PTH\|.desktop,,g"
+find_desktop_files_path "$PTH"

os2borgerpc/desktop/desktop_program_shortcut.sh

@@ -13,31 +13,31 @@
 #    This parameter IS case-sensitive as some applications have
 #    capitalized characters in their filename.
 
-set -x
-
 ADD="$1"
 PROGRAM="$2"
 
-SHADOW=".skjult"
+SHADOW_DESKTOP="/home/.skjult/Skrivebord"
+SNAP_DESKTOP_FILE_PATH="/var/lib/snapd/desktop/applications"
+APT_DESKTOP_FILE_PATH="/usr/share/applications"
 
 # TODO?: Make it replace all desktop icons which are copies with symlinks?
 
-mkdir --parents /home/$SHADOW/Skrivebord
+mkdir --parents $SHADOW_DESKTOP
 
 if [ "$ADD" = 'True' ]; then
-  if [ -f "/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop" ]; then
-    DESKTOP_FILE=/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop
+  if [ -f "$SNAP_DESKTOP_FILE_PATH/${PROGRAM}_$PROGRAM.desktop" ]; then
+    DESKTOP_FILE=$SNAP_DESKTOP_FILE_PATH/${PROGRAM}_$PROGRAM.desktop
   else
-    DESKTOP_FILE=/usr/share/applications/$PROGRAM.desktop
+    DESKTOP_FILE=$APT_DESKTOP_FILE_PATH/$PROGRAM.desktop
   fi
 
   # Remove it first as it may be a copy and not symlink (ln --force can't overwrite regular files)
-  rm "/home/$SHADOW/Skrivebord/$PROGRAM.desktop"
+  rm "$SHADOW_DESKTOP/$PROGRAM.desktop"
 
-  ln --symbolic --force "$DESKTOP_FILE" /home/$SHADOW/Skrivebord/
+  ln --symbolic --force "$DESKTOP_FILE" $SHADOW_DESKTOP/
 else
-  if [ -f "/home/$SHADOW/Skrivebord/${PROGRAM}_$PROGRAM.desktop" ]; then
+  if [ -f "$SHADOW_DESKTOP/${PROGRAM}_$PROGRAM.desktop" ]; then
     PROGRAM=${PROGRAM}_$PROGRAM
   fi
-  rm --force "/home/$SHADOW/Skrivebord/$PROGRAM.desktop"
+  rm --force "$SHADOW_DESKTOP/$PROGRAM.desktop"
 fi

os2borgerpc/os2borgerpc/browser_set_default.sh

@@ -17,7 +17,7 @@ FILE="/usr/share/applications/defaults.list"
 
 # They can type in "chrome" but the desktop file is called google-chrome
 if [ "$BROWSER" = "chrome" ]; then
-  BROWSER=google-chrome.desktop
+  BROWSER=google-chrome
 fi
 
 # Handle snaps, which have names like firefox_firefox.desktop