diff --git a/functions/setup.fish b/functions/setup.fish index f346aae..fd90186 100644 --- a/functions/setup.fish +++ b/functions/setup.fish @@ -41,7 +41,7 @@ function upin set update "$pkg update && $pkg upgrade" set search "$pkg search" set remove "$pkg remove" - set unattendet "$pkg install --assume-yes" + set unattendet "$pkg install --assume-yes" set ALIASES "-- You're using APT aliases!! --" end end @@ -62,7 +62,7 @@ function upin set update "$pkg -Syu" set search "$pkg -Ss" set remove "$pkg -R" - set unattendet "$pkg install --no-confirm" + set unattendet "$pkg install --no-confirm" set ALIASES "-- You're using Arch!! - installed helper: yay --" else if command -v pacman >/dev/null 2>&1 @@ -71,7 +71,7 @@ function upin set update "$pkg -Syu" set search "$pkg -Ss" set remove "$pkg -R" - set unattendet "$pkg install --no-confirm" + set unattendet "$pkg install --no-confirm" set ALIASES "-- by the PACMAN - You're using Arch!! --" end end @@ -97,8 +97,12 @@ function upin set search "$pkg search" set ALIASES "-- Alpine.. right, this fast os is evolving.. --" end + if set -q unattendet + set -U FISH_INSTALL $unattendet + else + set -U FISH_INSTALL $install + end if test -n "$install" - set -U FISH_INSTALL ${unattendet:=$install} set vars "install" "update" "search" "remove" for env in $vars if not test -z "$env" @@ -178,10 +182,10 @@ end # │ FUNCTION: check fisher plugin dependencies │ # ╰────────────────────────────────────────────╯ function dep_fisher -# ─< Define dependencies for the plugins used by fisher >─────────────────────────────────── + # ─< Define dependencies for the plugins used by fisher >─────────────────────────────────── begin set dependencies "fzf" "btop" "fastfetch" "curl" "wget" "cmatrix" -# ─< Check and install dependencies >─────────────────────────────────────────────────────── + # ─< Check and install dependencies >─────────────────────────────────────────────────────── for dep in $dependencies if not command -v $dep >/dev/null 2>&1 echo "Dependency $dep is not installed. Installing..."