adapting for dream use

swww.sh

@@ -6,39 +6,40 @@
     command -v "$@" >/dev/null 2>&1
   }
 
-  # WHY:
+  source-script() {
-  # This import will give you the following variables:
+    local url="$1"
-  # _sudo="sudo -E" <- only if non root user
+    local import="$(mktemp)"
-  # distro = <distro name, like 'arch', 'debian', 'fedora'..>
+
-  # arch = bool
+    # ─< if $1 is a local file, source this one instead >─────────────────────────────────────
-  # fedora = bool
+    if [ -f "$url" ]; then
-  # opensuse =  bool....
+      source "$url"
-  # You can then use it for, `if $arch; then`
+      sleep 0.1
-  # Also this gives you the _install command, which installs a package pased on the packagemanager/distro used.
+      return 0
-  # CAUTION:
-  # This only wokrs for generic package names, like neovim, or vim, or tmux etc..
-  # not every package packagemanager has the same packagenames for their packages..
-  getImports() {
-    i="https://git.k4li.de/scripts/imports/raw/branch/main/distros.sh"
-    import="$(mktemp)"
-    if command_exists curl; then
-      curl -fsSL $i -o $import
     else
-      echo "curl is required, but missing.."
+      # ─< if $1 is a url, grab it and source it, also deletes afterwards >─────────────────────
-      exit 1
+      if command_exists curl; then
+        curl -fsSL $url -o $import
+      elif command_exists wget; then
+        wget -o $import $url
+      else
+        echo "curl/wget is required, but missing.."
+        exit 69
       fi
 
       source "$import"
-    sleep 0.3
+
-    rm "$import"
+      echo "${BLUE}Sourcing external script:${NC} $url"
-    echo_warning "cleaned $import"
+      line
+      sleep 0.1
+      rm -f "$import"
+    fi
   }
 
   checkBuildDependencies() {
     echo_pkg deps "Installing build dependencies.."
     local deps=(git xdg-output liblz4-dev wayland-protocols)
     # echo "DEBUG: Installing ${deps[@]}"
-    checkAndInstall "${deps[@]}"
+    check-and-install ${deps[@]}
 
     if ! command_exists cargo; then
       curl --proto '=https' --tlsv1.2 -sSf "https://sh.rustup.rs" | sh
@@ -65,13 +66,13 @@
 
   main() {
     if $silent; then
-      echo_warning "Executing script silently!"
+      pen bold yellow "Executing script silently!"
     fi
 
     case "$distro" in
     arch)
       echo_pkg arch "Arch detected.. installing directly"
-      run _install swww
+      check-and-install swww
       ;;
     debian | ubuntu)
       checkBuildDependencies
@@ -84,7 +85,30 @@
     esac
   }
 
-  if getImports; then
+  # WHY:
+  # This import will give you the following variables:
+  # _sudo="sudo -E" <- only if non root user
+  # distro = <distro name, like 'arch', 'debian', 'fedora'..>
+  # arch = bool
+  # fedora = bool
+  # opensuse =  bool....
+  # You can then use it for, `if $arch; then`
+  # Also this gives you the pkg-install command, which installs a package pased on the packagemanager/distro used.
+  # CAUTION:
+  # This only wokrs for generic package names, like neovim, or vim, or tmux etc..
+  # not every package packagemanager has the same packagenames for their packages..
+  setup-env() {
+    # local beddu=https://git.k4li.de/scripts/beddu/raw/branch/main/dist/beddu.sh
+    # local pika=https://git.k4li.de/scripts/imports/raw/branch/main/distros.sh
+    local dream=https://git.k4li.de/scripts/imports/raw/branch/main/dream.sh
+
+    if ! command_exists pkg-install && ! command_exists check-and-install && ! command_exists spin; then
+      source-script $dream
+      line
+    fi
+  }
+
+  if setup-env; then
     # ─< package variable >───────────────────────────────────────────────────────────────────
     unset PACKAGE
 
@@ -95,8 +119,8 @@
 
     PACKAGE=swww
     if command_exists "$PACKAGE"; then
-      echo_warning "$PACKAGE is already installed!"
+      pen bold yellow "$PACKAGE is already installed!"
-      echo_warning "Exiting now!"
+      pen bold yellow "Exiting now!"
       exit 69
     fi
 
@@ -111,5 +135,4 @@
 
     main
   fi
-
 }