generally overworked

Author: TheUnixDemon

src/borg/core.sh

@@ -10,5 +10,5 @@ if ! source "$borg_conf_file"; then
     echo "failed to load configuration *$borg_conf_file*; abort"
     exit 1
 fi
-
+# server preparation & testing
 source "$BORG_WORKING_DIR/server.sh" # borg server

src/borg/server.sh

@@ -36,7 +36,7 @@ else
     exit 1
 fi
 
-# === pre func ===
+# === func ===
 # checks if connection works
 validate_borg_conn() {
     borg info 1> /dev/null && return 0
@@ -94,3 +94,11 @@ else
     echo "$prefix unsuccessful"
     exit 1
 fi
+# checking home dir within archive
+prefix="validating directory '$BORG_HOME' ..."
+if [[ -d "$BORG_HOME" ]]; then
+    echo "$prefix successful"
+else
+    echo "$prefix unsuccessful"
+    exit 1
+fi

src/borgserver.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-# env variables
-export ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# === vars ===
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
+# === func ===
 # sudo temp for unattended install
 keep_alive_sudo() {
     if sudo -v; then
@@ -20,14 +21,60 @@ keep_alive_sudo() {
         return 1
     fi
 }
+# installing required software
+install_requirements() {
+    sudo pacman -Syu openssh borg rsync && return 0
+    return 1
+}
+# rsync recovery
+make_recovery() {
+    # recovery locations
+    declare -A sync_dirs=(
+        ["$BORG_HOME/"]="$HOME"
+    )
+    # make recovery with borg archive to local OS
+    for source in "${!sync_dirs[@]}"; do
+        dest="${sync_dirs[$source]}" # key(source) -> value(dest)
+        if [[ -e "$source" && -e "$dest" ]]; then
+            rsync -avP --exclude-from="$ROOT_DIR/exclude.txt" "$source" "$dest" && echo "successfully synchronized from *$source* to *$dest*"
+        else
+            echo "*$source* or *$dest* doesn't exists; skipping *$source* -> *$dest*"
+        fi
+    done
+}
 
+# === pre act ===
 # keep alive sudo permission
 keep_alive_sudo || exit 1
+# pre install required software
+prefix="installing software requirements ..."
+if install_requirements; then
+    echo "$prefix successful"
+else
+    echo "$prefix unsuccessful"
+    exit 1
+fi
+
+# === main ===
+# loading scripts
+source "$ROOT_DIR/packages/core.sh" # install packages & enable services 
+source "$ROOT_DIR/borg/core.sh" # borg backup connection & mounting
+
+# installing software setup
+install_pkgs # installing packages
+setup_services # enabling & setting up services
 
-# execute installation & recovery
-source "$ROOT_DIR/inst.sh" # setup package requirements 
-source "$ROOT_DIR/borgserver.sh" # borg backup & rsync as recovery method
+# copying backup to local OS using rsync
+make_recovery
 
+# === post act ===
+# unmount used archive
+prefix="unmounting 'latest::$latest' at '$MOUNT_DIR' ..."
+if do_unmount; then
+    echo "$prefix successful"
+else
+    echo "$prefix unsuccessful"
+fi
 # undo keep alive sudo permission
 if [[ -n "$keep_alive" ]] && kill -0 "$keep_alive" 2>/dev/null; then
     kill "$keep_alive" && echo "removed keep-alive (sudo) process"

src/inst.sh

@@ -1,2 +1,22 @@
 #!/bin/bash
 
+# === vars ===
+PKGS_WORKING_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # location env
+
+# === func ===
+# installing packages with pacman, yay & flatpak
+install_pkgs(
+    inst_pacman_pkgs $nvidia_pkgs $pacman_pkgs
+    inst_yay_pkgs $yay_pkgs
+    inst_flatpak_pkgs $flatpak_pkgs
+)
+# setup services
+setup_services() {
+    psql_service
+    otd_service
+    bt_service
+}
+
+# === main ===
+# installation preparation
+source "$PKGS_WORKING_DIR/install.sh"