From b7405d3ff67beb0e7bf4beec793fb1beeb727375 Mon Sep 17 00:00:00 2001
From: pika <pika@team-pieck.de>
Date: Sat, 24 May 2025 15:04:29 +0200
Subject: [PATCH] already pretty good?

---
 postinstall.sh | 142 +++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 74 deletions(-)

diff --git a/postinstall.sh b/postinstall.sh
index 8970528..32accc3 100644
--- a/postinstall.sh
+++ b/postinstall.sh
@@ -7,26 +7,8 @@ command_exists() {
   command -v "$@" >/dev/null 2>&1
 }
 
-# if command_exists "$PACKAGE"; then
-#   echo_warning "$PACKAGE is already installed!"
-#   echo_warning "Exiting now!"
-#   exit 69
-# fi
-
-# WHY:
-# This import will give you the following variables:
-# _sudo="sudo -E" <- only if non root user
-# distro = <distro name, like 'arch', 'debian', 'fedora'..>
-# arch = bool
-# fedora = bool
-# opensuse =  bool....
-# You can then use it for, `if $arch; then`
-# Also this gives you the _install and _remove command, which installs/removes a package pased on the packagemanager/distro used.
-# CAUTION:
-# This only works for generic package names, like neovim, or vim, or tmux etc..
-# not every package packagemanager has the same packagenames for their packages..
-getImports() {
-  local url="https://git.k4li.de/scripts/imports/raw/branch/main/distros.sh"
+source-script() {
+  local url="$1"
   local import="$(mktemp)"
   if command_exists curl; then
     curl -fsSL $url -o $import
@@ -43,7 +25,7 @@ getImports() {
 }
 
 getDependencies() {
-  echo_info "Checking build dependencies.."
+  pen bold blue "Checking build dependencies.."
 
   # INFO:
   # ╭─────────────────────────────────────────────────────────────────────────╮
@@ -107,62 +89,72 @@ getDependencies() {
 
   case "$distro" in
   debian | ubuntu | arch | fedora | alpine | opensuse)
-    echo_info "Installing base packages.."
+    pen bold blue "Installing base packages.."
 
-    checkAndInstall "${generalDeps[@]}"
+    check-and-install ${generalDeps[@]}
 
-    checkAndInstall "${pkgArray[@]}"
+    check-and-install ${pkgArray[@]}
     ;;
   *)
-    echo_error "There are no dependencies to install for $distro"
-    return 69
+    echo-error "There are no dependencies to install for $distro"
+    return 0
     ;;
   esac
 }
 
 removeBloat() {
   if ! $arch; then
-    echo_info "Removing bloat.."
-    _remove "${generalBloat[@]}"
+    spin "Removing bloat.."
+    for pkg in "${generalBloat[@]}"; do
+      if run --err err pkg-remove $pkg; then
+        upclear
+        check "Removed $pkg"
+      else
+        upclear
+        throw "Error while removing $pkg"
+        echo-error "${err:-}"
+      fi
+    done
   fi
 }
 
 _nala() {
   if command_exists nala; then
-    echo_info "Nala is already present, fetching mirros now!"
-    echo_warning "(This might take a minute or two, depending on your internet speed)"
-    $_sudo nala fetch --auto --assume-yes --https-only
-  else
-    echo_note "Nala is not installed on the system, do you want to install it now? (Y/n): "
-    read -r inst_nala </dev/tty
-    case "$inst_nala" in
-    N | n)
-      echo_warning "All right, continue without nala!"
-      ;;
-    *)
-      echo_note "Installing nala.."
-      $_sudo apt install nala --assume-yes &&
-        echo_info "Fetching best mirrors"
+    # pen bold blue "Nala is already present, fetching mirros now!"
+    # pen bold yellow "(This might take a minute or two, depending on your internet speed)"
+    if confirm "Nala is already present. Do you want to auto fetch the best mirrors?"; then
+      check green bold "Depending on your internet speed, this might take a while.."
       $_sudo nala fetch --auto --assume-yes --https-only
-      ;;
-    esac
+    fi
+  else
+    if confirm "Nala is not installed on the system, do you want to install it now?" </dev/tty; then
+      spin bold yellow "Installing nala.."
+      if run --err err $_sudo apt install nala --assume-yes; then
+        upclear
+        check bold green "Installed nala"
+      else
+        throw "Error installing nala!"
+      fi
+
+      pen bold blue "Fetching best mirrors"
+      $_sudo nala fetch --auto --assume-yes --https-only
+    fi
   fi
 }
 
 main() {
-
   if $silent; then
-    echo_warning "Executing script silently!"
+    pen bold yellow "Executing script silently!"
   fi
 
   # Getting general dependencies
   if ! getDependencies; then
-    echo_error "Error when installing dependencies.."
+    echo-error "Error when installing dependencies.."
   fi
 
   # removing 'bloat'
   if ! removeBloat; then
-    echo_error "Error when removing bloat.."
+    echo-error "Error when removing bloat.."
   fi
 
   case "$distro" in
@@ -174,42 +166,44 @@ main() {
     if [ -f "$sources_file" ]; then
       # Comment out CD-ROM entries using sudo
       $_sudo sed -i 's/^[[:space:]]*deb[[:space:]]\+cdrom:/#&/' "$sources_file"
-      echo_info "CD-ROM entries have been commented out in $sources_file"
+      pen bold blue "CD-ROM entries have been commented out in $sources_file"
     else
       if [ ! -f "/etc/apt/sources.d/sources.list" ]; then
-        echo_error "Error: $sources_file not found"
+        echo-error "Error: $sources_file not found"
       fi
     fi
-
     _nala
     ;;
+  *)
+    pen bold yellow "There are no distro specific things to install for your distro: $(pen bold red $distro)"
+    ;;
   esac
 }
 
-# checkAUR() {
-#   if ! command_exists yay && ! command_exists paru; then
-#     return 69
-#   else
-#     return 0
-#   fi
-# }
-#
-# if command_exists pacman; then
-#   if ! checkAUR; then
-#     paruTempDir="$(mktemp -d)"
-#     # if ! command_exists paru; then
-#     echo "${YELLOW}Installing paru as AUR helper...${NC}"
-#     $_sudo pacman -S --needed --noconfirm base-devel git
-#     cd /opt && $_sudo git clone https://aur.archlinux.org/paru-bin.git "$paruTempDir/paru" && $_sudo chown -R "$USER": "$paruTempDir/paru"
-#     cd "$paruTempDir/paru" && makepkg --noconfirm -si
-#     echo "${GREEN}Paru installed${NC}"
-#     # else
-#     #   printf "%b\n" "${GREEN}Paru already installed${RC}"
-#     # fi
-#   fi
-# fi
+# WHY:
+# This import will give you the following variables:
+# _sudo="sudo -E" <- only if non root user
+# distro = <distro name, like 'arch', 'debian', 'fedora'..>
+# arch = bool
+# fedora = bool
+# opensuse =  bool....
+# You can then use it for, `if $arch; then`
+# Also this gives you the pkg-install command, which installs a package pased on the packagemanager/distro used.
+# CAUTION:
+# This only wokrs for generic package names, like neovim, or vim, or tmux etc..
+# not every package packagemanager has the same packagenames for their packages..
+setup-env() {
+  # local beddu=https://git.k4li.de/scripts/beddu/raw/branch/main/dist/beddu.sh
+  # local pika=https://git.k4li.de/scripts/imports/raw/branch/main/distros.sh
+  local dream=https://git.k4li.de/scripts/imports/raw/branch/main/dream.sh
 
-if getImports; then
+  if ! command_exists pkg-install && ! command_exists check-and-install && ! command_exists spin; then
+    source-script $dream
+    line
+  fi
+}
+
+if setup-env; then
   # ─< package variable >───────────────────────────────────────────────────────────────────
   unset PACKAGE
   # ─< argument list variables >────────────────────────────────────────────────────────────