diff --git a/dream.sh b/dream.sh index 50dc6e1..5303ea5 100644 --- a/dream.sh +++ b/dream.sh @@ -148,26 +148,22 @@ check-and-install() { # done line for pkg in "$@"; do - ((accum++)) - local count="[${accum}/${pkglength}]" + # ((accum++)) + # local count="[${accum}/${pkglength}]" if ! command-exists $pkg; then - spin "$(pen yellow bold $count)$(pen bold $pkg)" - # pkg-eval spin '"$(pen yellow bold $count Installing" $pkg)' + spin bold "$(pen bold yellow Installing) $pkg" if run --err err pkg-install $pkg; then upclear - check "$(pen bold grey Installed) $(pen $pkg $count)" - # pkg-eval check '"$(pen bold green ${accum}/${pkglenght} Installed)" $pkg' + check "$(pen bold green Installed) $pkg" else upclear - throw "$(pen bold red Something went wrong! Could not install) $(pen bold grey $pkg $count)" - # pkg-eval err 'Something went wrong! Could not install "$(pen bold red $count $pkg)"' + throw "Something went wrong! Could not install $(pen bold red $pkg)" echo-error "${err:-}" fi else upclear - check green bold "$(pen pkg) $(pen grey bold "was already installed")" + check bold "$pkg $(pen grey bold 'was already installed')" fi - sleep 0.001 done }