Update software installer script

Author: AgenttiX

apt/install_software.sh

@@ -5,7 +5,7 @@ set -eu
 # https://flatpak.org/setup/Kubuntu
 
 # These have to be installed manually:
-# Google Chrome, Steam, TeamViewer
+# TeamViewer
 
 if [ "${EUID}" -ne 0 ]; then
   echo "This script should be run as root."
@@ -20,8 +20,18 @@ else
 fi
 set -u
 
-echo "Installing apt packages."
+echo "Configuring apt/dpkg architectures."
+ARCH="$(uname -i)"
+FOREIGN_ARCHS="$(dpkg --print-foreign-architectures)}"
+if [ "${ARCH}" = "x86_64" ] && [[ "${FOREIGN_ARCHS}" != *"i386"* ]]; then
+  echo "Detected x86_64 architecture where i386 is not enabled. Enabling i386."
+  dpkg --add-architecture i386
+fi
+
+echo "Updating apt repositories."
 apt update
+
+echo "Constructing the list of apt packages to install."
 BASE_PACKAGES=(
   # Servers should have git-gui too for X11 forwarding.
   "apt-transport-https" "bleachbit" "ca-certificates" "git" "git-gui" "htop" "mosh" "openssh-server" "screen" "ufw"
@@ -36,27 +46,46 @@ PYTHON_PACKAGES=(
   "python3-dev" "python3-setuptools" "python3-venv" "python3-wheel"
 )
 UTILS_PACKAGES=(
-  "autojump" "autossh" "boinc-client-opencl" "cifs-utils" "curl" "git-delta" "gpg-agent" "links"
+  "autojump" "autossh" "cifs-utils" "curl" "git-delta" "gpg-agent" "links"
   "mtr-tiny" "optipng" "pandoc" "texlive-full" "traceroute" "wget" "wireguard" "xindy" "yt-dlp" "zsh"
 )
 APT_PACKAGES=("${BASE_PACKAGES[@]}" "${DEV_PACKAGES[@]}" "${DOCKER_PACKAGES[@]}" "${GUI_PACKAGES[@]}" "${PYTHON_PACKAGES[@]}" "${UTILS_PACKAGES[@]}")
 
 # If running in a desktop environment. All GUI programs should go here.
 if [ "${IS_DESKTOP}" = true ]; then
   APT_PACKAGES+=(
-    "boinc" "clamtk" "filelight" "filezilla" "freerdp2-wayland" "gimp" "inkscape" "kde-config-flatpak"
-    "keepassxc" "ktorrent" "libenchant-2-voikko" "libreoffice" "libreoffice-help-fi" "libreoffice-voikko"
-    "mumble" "network-manager-openvpn" "obs-studio" "remmina" "remmina-plugin-kwallet" "signal-desktop"
+    "clamtk" "filelight" "filezilla" "gimp" "inkscape"
+    "keepassxc" "ktorrent" "libenchant-2-voikko"
+    "libreoffice" "libreoffice-help-en-us" "libreoffice-help-fi" "libreoffice-voikko"
+    "mumble" "network-manager-openvpn" "remmina" "signal-desktop" "steam"
     "synaptic" "texmaker" "tikzit" "tmispell-voikko" "vlc"
   )
+  if [ "${XDE_CURRENT_DESKTOP}" = "KDE" ]; then
+    APT_PACKAGES+=("kde-config-flatpak" "remmina-plugin-kwallet")
+  fi
+  if [ "${XDE_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
+    echo "Adding Google Chrome to the installation list."
+    CHROME_DEB="google-chrome-stable_current_amd64.deb"
+    CHROME_DEB_PATH="${SCRIPT_DIR}/${CHROME_DEB}"
+    wget "https://dl.google.com/linux/direct/${CHROME_DEB}" -O "${CHROME_DEB_PATH}"
+    APT_PACKAGES+=("${CHROME_DEB_PATH}")
+  fi
 fi
 
 # If running on physical hardware
 if ! grep -q "hypervisor" /proc/cpuinfo; then
   APT_PACKAGES+=(
-    "bluetooth" "clinfo" "clpeak" "cutecom" "exfatprogs" "gdisk" "gnome-disk-utility" "gparted"
-    "lm-sensors" "pipewire-audio" "pocl-opencl-icd" "powertop" "rpi-imager" "s-tui" "stress" "usbtop"
-    )
+    "bluetooth" "boinc-client-opencl" "clinfo" "clpeak" "exfatprogs" "gdisk"
+    "lm-sensors" "pocl-opencl-icd" "powertop" "s-tui" "stress" "usbtop"
+  )
+  if [ "${IS_DESKTOP}" = true ]; then
+    APT_PACKAGES+=("boinc" "cutecom" "gnome-disk-utility" "gparted" "obs-studio" "pipewire-audio" "rpi-imager")
+  fi
 fi
 # If running on a laptop
 if [ "$(hostnamectl chassis)" = "laptop" ]; then
@@ -71,9 +100,9 @@ if command -v nvidia-smi &> /dev/null; then
   APT_PACKAGES+=("boinc-client-nvidia-cuda")
 fi
 
+echo "Installing apt packages."
 apt install "${APT_PACKAGES[@]}"
 
-
 if [ "${IS_DESKTOP}" = true ]; then
   echo "Installing Snap packages."
   snap install pycharm-professional --classic