Merge branch 'feature/52552_make_scripts_work_with_snaps_particularly_firefox' into 'master'

Make relevant scripts work with snaps, particularly firefox

See merge request os2borgerpc/os2borgerpc-scripts!176

Author: Andreas Poulsen

os2borgerpc/chrome/chrome_replace_firefox_in_launcher.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
-sed -i "s/firefox/google-chrome/" /etc/dconf/db/os2borgerpc.d/02-launcher-favorites
+# 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
+  sed -i "s/firefox/google-chrome/" /etc/dconf/db/os2borgerpc.d/02-launcher-favorites
+fi
 
 dconf update

os2borgerpc/desktop/desktop_launcher_program_shortcut.sh

@@ -10,6 +10,10 @@
 ADD=$1
 PROGRAM=$2
 
+if [ -f "/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop" ]; then
+  PROGRAM="${PROGRAM}_$PROGRAM"
+fi
+
 if [ "$ADD" = "True" ]; then
 
   # Append the program specified above to the menu/launcher

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

@@ -3,27 +3,41 @@
 # Adds/Removes programs from the desktop in Ubuntu 20.04
 # Author: [email protected]
 #
-# Note that the program assumes danish locale, where the 'Desktop' directory
+# Note that this script currently assumes danish locale, where the 'Desktop' directory
 # is instead named 'Skrivebord'.
 #
 # Arguments:
 # 1: Use a boolean to decide whether to add or remove the program shortcut
 # 2: This argument should specify the name of a program (.desktop-file)
-# under /usr/share/applications/
+#    under /usr/share/applications/ or /var/lib/snapd/desktop/applications/
+#    This parameter IS case-sensitive as some applications have
+#    capitalized characters in their filename.
 
-lower() {
-    echo "$@" | tr '[:upper:]' '[:lower:]'
-}
+ADD="$1"
+PROGRAM="$2"
 
-ADD=$1
-PROGRAM="$(lower "$2")"
+SHADOW_DESKTOP="/home/.skjult/Skrivebord"
+SNAP_DESKTOP_FILE_PATH="/var/lib/snapd/desktop/applications"
+APT_DESKTOP_FILE_PATH="/usr/share/applications"
 
-SHADOW=.skjult
+# TODO?: Make it replace all desktop icons which are copies with symlinks?
+
+mkdir --parents $SHADOW_DESKTOP
 
 if [ "$ADD" = 'True' ]; then
-  mkdir --parents /home/$SHADOW/Skrivebord
-  cp "/usr/share/applications/$PROGRAM.desktop" /home/$SHADOW/Skrivebord/
+  if [ -f "$SNAP_DESKTOP_FILE_PATH/${PROGRAM}_$PROGRAM.desktop" ]; then
+    DESKTOP_FILE=$SNAP_DESKTOP_FILE_PATH/${PROGRAM}_$PROGRAM.desktop
+  else
+    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 --force "$SHADOW_DESKTOP/$PROGRAM.desktop"
+
+  ln --symbolic --force "$DESKTOP_FILE" $SHADOW_DESKTOP/
 else
-  echo "Forsøger at slette programmet $PROGRAM"
-  rm "/home/$SHADOW/Skrivebord/$PROGRAM.desktop"
+  if [ -f "$SHADOW_DESKTOP/${PROGRAM}_$PROGRAM.desktop" ]; then
+    PROGRAM=${PROGRAM}_$PROGRAM
+  fi
+  rm --force "$SHADOW_DESKTOP/$PROGRAM.desktop"
 fi

os2borgerpc/desktop/desktop_shortcut_to_directory.sh

@@ -3,17 +3,23 @@
 # Places a shortcut on the Desktop to any directory on the file system
 #
 # Parameters:
-#   1: The path to the directory you want a shortcut to
-#   2: The name of the shortcut on the Desktop
+#   1: Whether to add or remove the shortcut
+#   2: The path to the directory you want a shortcut to
+#   3: The name of the shortcut on the Desktop
 
 set -ex
 
-DIRECTORY="$1"
-SHORTCUT_NAME="$2"
+ADD="$1"
+DIRECTORY="$2"
+SHORTCUT_NAME="$3"
 
 SHADOW_DESKTOP="/home/.skjult/Skrivebord"
 
 mkdir --parents $SHADOW_DESKTOP
 
-# Note: "ln" doesn't care if the destination ($DIRECTORY) exists
-ln --symbolic --force "$DIRECTORY" "$SHADOW_DESKTOP/$SHORTCUT_NAME"
+if [ "$ADD" = "True" ]; then
+  # Note: "ln" doesn't care if the destination ($DIRECTORY) exists
+  ln --symbolic --force "$DIRECTORY" "$SHADOW_DESKTOP/$SHORTCUT_NAME"
+else
+  rm "$SHADOW_DESKTOP/$SHORTCUT_NAME"
+fi

os2borgerpc/os2borgerpc/autostart_program.sh

@@ -1,42 +1,45 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
-# DESCRIPTION 
+# DESCRIPTION
 # This script either copies a given installed .desktop file to the autostart directory
-# or removes a given file from the autostart directory. 
+# or removes a given file from the autostart directory.
 #
-# To check which scripts are installed on a machine run the script 
-# "desktop_print_program_list.sh" AKA "Desktop - Vis programliste" with paremeter 
+# To check which scripts are installed on a machine run the script
+# "desktop_print_program_list.sh" AKA "Desktop - Vis programliste" with paremeter
 # "mulige" to print a full list of eligible files to add to autostart.
 #
 # PARAMENTERS
-# 1. String. The given file's name, either with no extension or with .desktop
-#            eg. "firefox" or "firefox.desktop". This parameter IS case-sensitive
-#            as some applications have capitalized characters in their filename.
+# 1. String. The given file's name, e.g. firefox, without the .desktop extension.
+#            This parameter IS case-sensitive as some applications have
+#            capitalized characters in their filename.
 # 2. Checkbox. Check this box to delete a file from the autostart folder instead.
 
-SELECTED=$1
-DELETE=$2
+set -x
 
-if [[ $SELECTED != *.desktop ]]; then
-    SELECTED="$SELECTED.desktop"
-fi
+PROGRAM="$1"
+DELETE="$2"
 
 AUTOSTART_DIR="/home/.skjult/.config/autostart"
-AUTOSTART_FILE="$AUTOSTART_DIR/$SELECTED"
-INSTALLED_APP_FILE="/usr/share/applications/$SELECTED"
 
-if [ "$DELETE" = "True" ]; then 
-    echo "Removing $SELECTED from autostart directory"
-    
-    rm "$AUTOSTART_FILE"
+if [ -f "/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop" ]; then
 
-    exit "$?"    
+  INSTALLED_APP_FILE="/var/lib/snapd/desktop/applications/${PROGRAM}_$PROGRAM.desktop"
+  AUTOSTART_FILE="$AUTOSTART_DIR/${PROGRAM}_$PROGRAM.desktop"
+else
+  INSTALLED_APP_FILE="/usr/share/applications/$PROGRAM.desktop"
+  AUTOSTART_FILE="$AUTOSTART_DIR/$PROGRAM.desktop"
 fi
 
-mkdir -p $AUTOSTART_DIR
+mkdir --parents $AUTOSTART_DIR
+
+# Remove it first, partially because ln even with --force cannot replace it if it's a regular file
+rm --force "$AUTOSTART_FILE"
 
-echo "Adding $SELECTED to autostart directory"
+if [ "$DELETE" != "True" ]; then
 
-cp "$INSTALLED_APP_FILE" "$AUTOSTART_FILE"
+  echo "Adding $PROGRAM to autostart directory"
 
-exit "$?"
+  ln --symbolic --force "$INSTALLED_APP_FILE" "$AUTOSTART_FILE"
+
+  exit "$?"
+fi

os2borgerpc/os2borgerpc/browser_set_default.sh

@@ -4,7 +4,6 @@
 #
 # Arguments:
 # 1: Which browser to set as default.
-#    Options are: 'firefox' or 'chrome'
 
 set -ex
 
@@ -16,10 +15,16 @@ BROWSER="$(lower "$1")"
 
 FILE="/usr/share/applications/defaults.list"
 
-if [ "$BROWSER" = "firefox" ]; then
-  DESKTOP_FILE=firefox.desktop
+# They can type in "chrome" but the desktop file is called google-chrome
+if [ "$BROWSER" = "chrome" ]; then
+  BROWSER=google-chrome
+fi
+
+# Handle snaps, which have names like firefox_firefox.desktop
+if [ -d "/snap/$BROWSER" ]; then
+	DESKTOP_FILE=${BROWSER}_$BROWSER.desktop
 else
-  DESKTOP_FILE=google-chrome.desktop
+	DESKTOP_FILE=${BROWSER}.desktop
 fi
 
 # We cleanup the defaults.list as sometimes it seems to be populated