Fix stinky code part 3 (final refactor)

- Unify install_package function and override with specific distros
- Move install_package functions to src/lib/install-package.sh
- BEGONE REPETITIVE CODE!
- Fix some typos
- Import install_package.sh where necessary
- Use more CONSTANTS in git-gpg-ssh-setup.sh
- Use #!/bin/bash as the default header
- Use rm -rf some/path on base-script.sh instead of rm -r some/path
- Add install_my_flatpak_packages function to base-script.sh
  - Allowing to install all of them in every system with ease
- New flatpak packages:
ca.parallel_launcher.ParallelLauncher (will test and remove)
com.github.Rosalie241.RMG (will test and remove)
net.rpcs3.RPCS3
net.pcsx2.PCSX2
org.DolphinEmu.dolphin-emu
org.ppsspp.PPSSPP
org.duckstation.DuckStation
net.kuribo64.melonDS
app.xemu.xemu
org.libretro.RetroArch
org.ryujinx.Ryujinx

Author: LeDragoX

linux-script.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 source ./src/lib/base-script.sh
 

src/lib/arch-base-script.sh

@@ -1,29 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 source ./src/lib/base-script.sh
+source ./src/lib/install-package.sh
 source ./src/lib/title-templates.sh
 
-function install_package() {
-  local apps=("$1")
-  if [[ $# -eq 1 ]]; then
-    local install_block="sudo pacman -S --needed --noconfirm"
-  else
-    local install_block="$2"
-  fi
-
-  echo_caption "Runnning: $install_block"
-  echo_caption "For each package: ${apps[*]}"
-
-  # Using IFS (Internal Field Separator) to manage arrays
-  local counter=0
-  while IFS=" " read -ra array; do
-    for app in "${array[@]}"; do
-      echo_section "($((counter += 1))/${#array[@]}) - ${app}"
-      eval "$install_block" "${app}"
-    done
-  done <<<"${apps[@]}"
-}
-
 function install_package_managers() {
   echo_title "Installing Package Managers (Yay, Snap)"
 
@@ -44,9 +24,9 @@ function install_package_managers() {
   echo "Snap will work only after loggin' out and in"
 
   echo_caption "Enabling Flatpak"
-  install_package "flatpak"
+  install_package_arch "flatpak"
 
-  echo_error "To finish the installation, this PC will reboot after confirmation!!!"
+  echo_error "To finish the installation, this PC will reboot after confirming!!!"
   wait_prompt
   reboot
 }
@@ -64,11 +44,11 @@ function pre_arch_setup() {
   echo_section "Initializing and Updating Repositories (Core, Extra, Community and Multilib)"
   sudo pacman-key --init
   sudo pacman-key --populate
-  install_package "archlinux-keyring" "sudo pacman -Syy --needed --noconfirm"
+  install_package_arch "archlinux-keyring" "sudo pacman -Syy --needed --noconfirm"
 
   echo_caption "Installing required packages for every script"
   # 2 Terminal Download Manager | 1 Git (If doesn't have) | 2 Compress/Extract zip files | 1 Tool to change Shell | 1 Z-Shell (ZSH)
-  install_package "curl wget git unzip zip which zsh"
+  install_package_arch "curl wget git unzip zip which zsh"
 
   fix_time_zone
 }
@@ -86,8 +66,8 @@ function pre_arch_setup() {
 # 7   sbctl -s /efi/EFI/systemd/systemd-bootx64.efi
 # 8   sbctl sign -s /efi/EFI/systemd/systemd-bootx64.efi
 # 9   bootctl install
-# 13  sbctl sign -s /efi/1f0883d502ec49c5a55e9acdd375bc4a/6.9.6-arch1-1/linux # GENERATED KERNEL DIR
-# 14  sbctl verify
-# 15  reboot
-# 16  sbctl status
-# 17  bootctl status
+# 10  sbctl sign -s /efi/1f0883d502ec49c5a55e9acdd375bc4a/6.9.6-arch1-1/linux # GENERATED KERNEL DIR
+# 11  sbctl verify
+# 12  reboot
+# 13  sbctl status
+# 14  bootctl status

src/lib/base-script.sh

@@ -1,5 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
+source ./src/lib/install-package.sh
 source ./src/lib/title-templates.sh
 
 SYSTEM_BASED_ON=$(grep -i "ID_LIKE=" /etc/*-release | sed -e "s/^.*ID_LIKE=//" | head -n1)
@@ -87,7 +88,7 @@ function install_fonts() {
   unzip JetBrainsMono.zip "fonts/ttf/*.ttf"
   echo_section "Moving JetBrains Mono font"
   mv --force --verbose fonts/ttf/*.ttf ./
-  rm -r fonts
+  rm -rf fonts/
   rm JetBrainsMono.zip
   popd || exit
 
@@ -105,12 +106,35 @@ function install_fonts() {
   fc-cache -v -f
 
   echo_caption "Removing fonts/ folder from $(pwd)"
-  rm -r fonts/
+  rm -rf fonts/
 
   echo_section "Create Downloads folder"
   mkdir --parents ~/Downloads
 }
 
+function install_my_flatpak_packages() {
+  local flatpak_apps=(
+    "dev.vencord.Vesktop"           # | Vesktop (better Discord alternative for linux)
+    "org.onlyoffice.desktopeditors" # | ONLYOFFICE Desktop Editors
+    # Emulators
+    "ca.parallel_launcher.ParallelLauncher" # ✅ | Nintendo 64
+    "com.github.Rosalie241.RMG"             # ✅ | Nintendo 64
+    "net.rpcs3.RPCS3"                       # ❌ | PS3
+    "net.pcsx2.PCSX2"                       # ✅ | PS2
+    "org.DolphinEmu.dolphin-emu"            # ❌ | Nintendo GameCube / Wii
+    "org.ppsspp.PPSSPP"                     # ✅ | PSP
+    "org.duckstation.DuckStation"           # ✅ | PS1
+    "net.kuribo64.melonDS"                  # ✅ | Nintendo DS
+    "app.xemu.xemu"                         # ❌ | Xbox
+    "org.libretro.RetroArch"                # ✅ | Most Retro
+    "org.ryujinx.Ryujinx"                   # ✅ | Nintendo Switch
+  )
+
+  echo_section "Installing via flatpak"
+  echo "${flatpak_apps[*]}"
+  install_package_flatpak "${flatpak_apps[*]}"
+}
+
 function install_zsh() {
   echo_title "Z-Shell install"
   echo_caption "Zsh should already be installed, this just to finish it's install"
@@ -131,7 +155,7 @@ function install_oh_my_zsh() {
 
   if [[ -d "$HOME/.oh-my-zsh" ]]; then
     echo_error "ATTENTION - Removing ~/.oh-my-zsh file to reinstall from 0."
-    sudo rm --recursive ~/.oh-my-zsh
+    sudo rm -rf ~/.oh-my-zsh
   fi
 
   echo_caption "Installing Oh My Zsh..."

src/lib/fedora-base-script.sh

@@ -1,37 +1,17 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 source ./src/lib/base-script.sh
+source ./src/lib/install-package.sh
 source ./src/lib/title-templates.sh
 
-function install_package() {
-  local apps=("$1")
-  if [[ $# -eq 1 ]]; then
-    local install_block="sudo dnf install -y"
-  else
-    local install_block="$2"
-  fi
-
-  echo_caption "Runnning: $install_block"
-  echo_caption "For each package: ${apps[*]}"
-
-  # Using IFS (Internal Field Separator) to manage arrays
-  local counter=0
-  while IFS=" " read -ra array; do
-    for app in "${array[@]}"; do
-      echo_section "($((counter += 1))/${#array[@]}) - ${app}"
-      eval "$install_block" "${app}"
-    done
-  done <<<"${apps[@]}"
-}
-
 function pre_fedora_setup() {
   # 2 Terminal Download Manager | 1 Git (If doesn't have) | 2 Compress/Extract zip files | 1 Tool to change Shell | 1 Z-Shell (ZSH) | 1 Install chsh commands + others
-  install_package "curl wget git unzip zip which zsh util-linux-user"
+  install_package_fedora "curl wget git unzip zip which zsh util-linux-user"
 
   fix_time_zone
 }
 
 function upgrade_all_fedora() {
   sudo dnf upgrade
-  install_package "dnf-plugin-system-upgrade"
+  install_package_fedora "dnf-plugin-system-upgrade"
 }

src/lib/install-package.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+source ./src/lib/title-templates.sh
+
+# TODO: detect the OS package manager and do it automatically
+# TODO 2: Allow to use flags such as:
+# - Per Distro: --apt --dnf --aur (with yay) --pacman
+# - Globally: --snap --flatpak (--nix?)
+# - More options: --single-install (default) --multiple-install --add-apt-repo
+function install_package() {
+  local apps=("$1")
+  if [[ $# -eq 1 ]]; then
+    echo_error "Package install command missing!!! Quitting..." || exit
+  else
+    local install_block="$2"
+  fi
+
+  echo_caption "Runnning: $install_block"
+  echo_caption "For each package: ${apps[*]}"
+
+  # Using IFS (Internal Field Separator) to manage arrays
+  local counter=0
+  while IFS=" " read -ra apps; do
+    for app in "${apps[@]}"; do
+      echo_section "($((counter += 1))/${#apps[@]}) - ${app}"
+      eval "$install_block" "${app}"
+    done
+  done <<<"${apps[@]}"
+}
+
+function install_package_flatpak() {
+  if [[ $# -eq 1 ]]; then
+    install_package "$1" "flatpak install flathub --system -y"
+  elif [[ $# -eq 2 ]]; then
+    install_package "$1" "$2"
+  fi
+}
+
+function install_package_arch() {
+  if [[ $# -eq 1 ]]; then
+    install_package "$1" "sudo pacman -S --needed --noconfirm"
+  elif [[ $# -eq 2 ]]; then
+    install_package "$1" "$2"
+  fi
+}
+
+function install_package_fedora() {
+  if [[ $# -eq 1 ]]; then
+    install_package "$1" "sudo dnf install -y"
+  elif [[ $# -eq 2 ]]; then
+    install_package "$1" "$2"
+  fi
+}
+
+function install_package_ubuntu() {
+  if [[ $# -eq 1 ]]; then
+    install_package "$1" "sudo apt install -y"
+  elif [[ $# -eq 2 ]]; then
+    install_package "$1" "$2"
+  fi
+}

src/lib/title-templates.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 function echo_title() {
   local text="$1"

src/lib/ubuntu-base-script.sh

@@ -1,29 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 source ./src/lib/base-script.sh
+source ./src/lib/install-package.sh
 source ./src/lib/title-templates.sh
 
-function install_package() {
-  local apps=("$1")
-  if [[ $# -eq 1 ]]; then
-    local install_block="sudo apt install -y"
-  else
-    local install_block="$2"
-  fi
-
-  echo_caption "Runnning: $install_block"
-  echo_caption "For each package: ${apps[*]}"
-
-  # Using IFS (Internal Field Separator) to manage arrays
-  local counter=0
-  while IFS=" " read -ra array; do
-    for app in "${array[@]}"; do
-      echo_section "($((counter += 1))/${#array[@]}) - ${app}"
-      eval "$install_block" "${app}"
-    done
-  done <<<"${apps[@]}"
-}
-
 function pre_ubuntu_setup() {
   echo_title "Pre Ubuntu Setup"
   echo_section "Fix/Update currently installed Packages"
@@ -40,7 +20,7 @@ function pre_ubuntu_setup() {
 
   echo_caption "Installing required packages for every script..."
   # 2 Terminal Download Manager | 1 Git (If doesn't have) | 2 Compress/Extract zip files | 1 Tool to change Shell | 1 Z-Shell (ZSH)
-  install_package "curl wget git unzip zip zsh"
+  install_package_ubuntu "curl wget git unzip zip zsh"
 
   fix_time_zone
 }