Fix bugs in installer scripts

Author: AgenttiX

apt/install_software.sh

@@ -60,12 +60,13 @@ if [ "${IS_DESKTOP}" = true ]; then
     "mumble" "network-manager-openvpn" "remmina" "signal-desktop" "steam"
     "synaptic" "texmaker" "tikzit" "tmispell-voikko" "vlc"
   )
-  if [ "${XDE_CURRENT_DESKTOP}" = "KDE" ]; then
+  if [ "${XDG_CURRENT_DESKTOP}" = "KDE" ]; then
     APT_PACKAGES+=("kde-config-flatpak" "remmina-plugin-kwallet")
   fi
-  if [ "${XDE_SESSION_TYPE}" = "wayland" ]; then
-    APT_PACKAGES+=("freerdp2-wayland")
-  fi
+  # XDG_SESSION_TYPE is not set properly when running with sudo.
+  # if [ "${XDG_SESSION_TYPE}" = "wayland" ]; then
+  #   APT_PACKAGES+=("freerdp2-wayland")
+  # fi
   if dpkg -s google-chrome-stable &> /dev/null; then
     echo "Google Chrome is already installed."
   else

drivers/install_cuda.sh

@@ -14,7 +14,10 @@ fi
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 # Delete old signing key
-apt-key del 7fa2af80
+if command -v apt-key &> /dev/null; then
+  echo "Removing old apt key."
+  apt-key del 7fa2af80
+fi
 
 if [ "${1}" = "--fix" ]; then
   apt purge "^cuda.*$" "^libnvidia.*$" "^nvidia.*$"

drivers/setup_nvidia_repos.sh

@@ -8,8 +8,9 @@ fi
 
 # CUDA
 # https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu
-wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/cuda-keyring_1.1-1_all.deb
-dpkg -i cuda-keyring_1.1-1_all.deb
+CUDA_KEYRING="cuda-keyring_1.1-1_all.deb"
+wget "https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/${CUDA_KEYRING}" -O "${CUDA_KEYRING}"
+dpkg -i "${CUDA_KEYRING}"
 
 # Nvidia Container Toolkit
 curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg