File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22
33# === vars ===
44ROOT_DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd) "
5+ WAIT=5 # basic time to wait in between
56
67# === func ===
78# sudo temp for unattended install
@@ -21,6 +22,25 @@ keep_alive_sudo() {
2122 return 1
2223 fi
2324}
25+ # simple user interaction
26+ usr_interact () {
27+ [[ -n " $1 " ]] && echo " $1 "
28+ while true ; do
29+ read -p " Confirm? (y/N) " answer
30+ case $answer in
31+ y|Y)
32+ return 0
33+ ;;
34+ n|N)
35+ return 1
36+ ;;
37+ * )
38+ continue
39+ ;;
40+ esac
41+ done
42+
43+ }
2444# installing required software
2545install_requirements () {
2646 sudo pacman -Syu openssh borg rsync && return 0
5777
5878# === main ===
5979# loading scripts
60- source " $ROOT_DIR /packages/core.sh" # install packages & enable services
61- source " $ROOT_DIR /borg/core.sh" # borg backup connection & mounting
62-
80+ source " $ROOT_DIR /packages/core.sh" ; sleep $WAIT # install packages & enable services
81+ source " $ROOT_DIR /borg/core.sh" ; sleep $WAIT # borg backup connection & mounting
6382# installing software setup
83+ while true ; do
84+ usr_interact " package installation via Pacman, Yay & Flatpak" && break
85+ done
86+ echo " starting package installation installation ..." ; sleep $WAIT
6487install_pkgs # installing packages
6588setup_services # enabling & setting up services
66-
89+ load_modules # load kernel modules
6790# copying backup to local OS using rsync
91+ while true ; do
92+ usr_interact " data recovery using Borg & Rsync" && break
93+ done
94+ echo " starting data recovery process ..." ; sleep $WAIT
6895make_recovery
6996
7097# === post act ===
Original file line number Diff line number Diff line change @@ -90,17 +90,17 @@ psql_service() {
9090 else
9191 echo " $prefix unsuccessful"
9292 fi
93- return 1
93+ exit 1
9494}
9595# opentabletdriver
9696otd_service () {
9797 systemctl --user enable --now opentabletdriver.service 1> /dev/null && return 0
98- return 1
98+ exit 1
9999}
100100# bluetooth
101101bt_service () {
102102 sudo systemctl enable --now bluetooth.service 1> /dev/null && return 0
103- return 1
103+ exit 1
104104}
105105
106106# === kernel modules ===
@@ -118,7 +118,7 @@ load_modules() {
118118 else
119119 echo " *$modules_list * not found"
120120 fi
121- return 1
121+ exit 1
122122}
123123
124124# === main ===
You can’t perform that action at this time.
0 commit comments