swww.sh

@@ -34,31 +34,13 @@
     fi
   }
 
-  check-cargo() {
-    if command_exists cargo; then
-      return 0
-    else
-      if [ -e "$HOME/.cargo/env" ]; then
-        . "$HOME/.cargo/env"
-      else
-        return 69
-      fi
-
-      if command-exists cargo; then
-        return 0
-      else
-        return 69
-      fi
-    fi
-  }
-
   checkBuildDependencies() {
     echo_pkg deps "Installing build dependencies.."
     local deps=(git xdg-output liblz4-dev wayland-protocols)
     # echo "DEBUG: Installing ${deps[@]}"
     check-and-install ${deps[@]}
 
-    if ! check-cargo; then
+    if ! command_exists cargo; then
       pen bold yellow "Installing cargo.."
       curl --proto '=https' --tlsv1.2 -sSf "https://sh.rustup.rs" | sh