diff --git a/dream.sh b/dream.sh index c7dc348..0165abb 100644 --- a/dream.sh +++ b/dream.sh @@ -233,14 +233,6 @@ _setup() { } ;; arch) - checkAUR() { - if ! command-exists yay && ! command_exists paru; then - return 69 - else - return 0 - fi - } - pkg-install() { if command-exists paru; then pkger=paru @@ -415,7 +407,7 @@ get_packager() { dist_setup() { case "$distro" in debian) - echo "${BOLD}Found ${RED}debian${NC}" + repen bold "Found $(pen red bold $distro)" _setup debian # Codename support if [ -n $VERSION_CODENAME ]; then @@ -428,7 +420,7 @@ dist_setup() { fi ;; ubuntu) - echo "${BOLD}Found ${BRIGHT_YELLOW}ubuntu${NC}" + repen bold "Found $(pen yellow bold $distro)" _setup ubuntu # Codename support if [ -n $VERSION_CODENAME ]; then @@ -441,14 +433,14 @@ dist_setup() { fi ;; fedora) - echo "${BOLD}Found ${BRIGHT_BLUE}fedora${NC}" + repen bold "Found $(pen blue bold $distro)" _setup fedora # Add version-specific var like: fedora_40=true fedora_version="fedora_${VERSION_ID//./_}" eval "$fedora_version=true" ;; arch) - echo "${BOLD}Found ${BLUE}arch${NC}" + repen bold "Found $(pen blue bold $distro)" _setup arch if command-exists yay || command_exists paru; then aur=true @@ -457,11 +449,11 @@ dist_setup() { fi ;; alpine) - echo "${BOLD}Found ${BLUE}alpine${NC}" + repen bold "Found $(pen blue bold $distro)" _setup $distro ;; opensuse) - echo "${BOLD}Found ${GREEN}opensuse${NC}" + repen bold "Found $(pen green bold $distro)" _setup $distro ;; esac @@ -485,7 +477,7 @@ update-package-list() { ;; arch) if command-exists pacman; then - if ! checkAUR; then + if ! $aur; then pen grey bold "If this is your first time after boot (or simmilarly soon) then this might take a while.." spin bold grey "You don't have an AUR helper, gonna install one for ya!" @@ -887,7 +879,10 @@ seek() { # ──────────────────────────────────────< end beddu >──────────────────────────────────── if check_env; then + # ─< gets the some variables like $aur, $debian, $ubuntu, $distro... >──────────────────── get_packager + + # ─< get more indepths variables like $trixie, $bookworm, $jammy, $fedora_40.. >────────── dist_setup # WHY: