From ef0428733631cae0d78ba6c7b274a003172c6cce Mon Sep 17 00:00:00 2001 From: pika Date: Sat, 24 May 2025 01:10:34 +0200 Subject: [PATCH] wip --- dream.sh | 57 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/dream.sh b/dream.sh index 397e49d..362d364 100644 --- a/dream.sh +++ b/dream.sh @@ -122,15 +122,36 @@ run-silent() { # if given an array, it checks if the command is available, and if not - installs all packages in that array one by one check-and-install() { - local pkg=$1 + # local pkg=$1 # echo "DEBUG:: GOT ARRAY :: ${@}" # INFO: if it's not a list, then just check and install the package.. - if [[ -z $2 ]]; then - spin bold yellow "Installing $pkg" - if ! command-exists "$pkg"; then - if run --err err pkg-install "$pkg"; then + # + # if [[ -z $2 ]]; then + # spin bold yellow "Installing $pkg" + # if ! command-exists "$pkg"; then + # if run --err err pkg-install "$pkg"; then + # upclear + # check bold "$(pen green bold 'Installed') $pkg" + # else + # upclear + # throw "Something went wrong! Could not install $(pen bold red $pkg)" + # echo-error "${err:-}" + # fi + # else + # upclear + # check bold "$pkg $(pen grey bold 'was already installed')" + # # echo_pkg deps "skipping $pkg - as it's ${RED}already installed.." + # fi + # else + local pkglength="${#@}" + # ─< else go though the list of items and do the same >─────────────────────────────────── + pen grey "Packages to install: $(pen green bold $pkglength)" + for pkg in "$@"; do + if ! command-exists $pkg; then + spin bold "$(pen bold yellow Installing) $pkg" + if run --err err pkg-install $pkg; then upclear - check bold "$(pen green bold 'Installed') $pkg" + check "$(pen bold green Installed) $pkg" else upclear throw "Something went wrong! Could not install $(pen bold red $pkg)" @@ -139,29 +160,9 @@ check-and-install() { else upclear check bold "$pkg $(pen grey bold 'was already installed')" - # echo_pkg deps "skipping $pkg - as it's ${RED}already installed.." fi - else - local pkglength="${#@}" - # ─< else go though the list of items and do the same >─────────────────────────────────── - pen grey "Packages to install: $(pen green bold $pkglength)" - for pkg in "$@"; do - if ! command-exists $pkg; then - spin bold "$(pen bold yellow Installing) $pkg" - if run --err err pkg-install $pkg; then - upclear - check "$(pen bold green Installed) $pkg" - else - upclear - throw "Something went wrong! Could not install $(pen bold red $pkg)" - echo-error "${err:-}" - fi - else - upclear - check bold "$pkg $(pen grey bold 'was already installed')" - fi - done - fi + done + # fi } # ─< Check if the user is root and set sudo variable if necessary >───────────────────────