move upgrade script

asd

other/bash_aliases.universal

@@ -23,7 +23,7 @@ alias please="sudo"
 alias NC_scripts="cd ${NC_SCRIPTS}"
 alias regex_rename="${LOCAL_SCRIPTS}/rename.sh"
 alias profile="${LOCAL_SCRIPTS}/profile_motd.sh"
-alias auto_update="sudo ${LOCAL_SCRIPTS}/upgrade.sh"
+alias auto_update="sudo ${LOCAL_SCRIPTS}/utils/upgrade.sh"
 alias aptgrep="apt list --installed | grep -i "
 alias reboot="sudo /sbin/reboot"
 alias shutdown="sudo /sbin/shutdown"

utils/upgrade.sh

@@ -144,7 +144,7 @@ echo "Finished Package Update"
 # SpotDL Virtual Environment
 ###############################################################################
 
-if [[ ! -d "$venv_dir" ]]; then
+if [[ ! -d "$venv_dir" ]] && [[ "$1" == "--create-venv" ]]; then
 
     echo "Creating SpotDL virtual environment"
 
@@ -152,62 +152,63 @@ if [[ ! -d "$venv_dir" ]]; then
 
     python3 -m venv "$venv_dir"
 fi
+if [[ -d "$venv_dir" ]]; then
+    if [[ ! -x "${venv_dir}/bin/pip3" ]]; then
     
-if [[ ! -x "${venv_dir}/bin/pip3" ]]; then
+        echo "Installing pip"
     
-    echo "Installing pip"
+        "${venv_dir}/bin/python" -m ensurepip --upgrade
+    fi
     
-    "${venv_dir}/bin/python" -m ensurepip --upgrade
+    echo "Updating venv tooling"
+    
+    "${venv_dir}/bin/pip3" install --upgrade \
+        pip \
+        setuptools \
+        wheel
+    
+    ###############################################################################
+    # Ensure required packages exist
+    ###############################################################################
+    
+    mkdir -p "${home_dir}/.local/bin"
+    
+    packages=(
+        spotdl
+        yt-dlp
+        youtube-dl
+    )
+    
+    for package in "${packages[@]}"; do
+    
+        echo "Checking package: ${package}"
+    
+        if ! "${venv_dir}/bin/pip3" show "$package" >/dev/null 2>&1; then
+    
+            echo "Installing ${package}"
+    
+            "${venv_dir}/bin/pip3" install "$package"
+    
+        else
+    
+            echo "Updating ${package}"
+    
+            "${venv_dir}/bin/pip3" install --upgrade "$package"
+        fi
+    
+        if [[ -x "${venv_dir}/bin/${bin}" ]]; then
+        
+            ln -sf "${venv_dir}/bin/${package}" "${home_dir}/.local/bin/${package}"
+        
+        fi
+        if [[ $? -eq 0 ]]; then
+            write_out "${package}                [${green}OK${norm}]"
+        else
+            write_out "${package}                [${red}FAIL${norm}]"
+        fi
+    done
 fi
 
-echo "Updating venv tooling"
-
-"${venv_dir}/bin/pip3" install --upgrade \
-    pip \
-    setuptools \
-    wheel
-
-###############################################################################
-# Ensure required packages exist
-###############################################################################
-
-mkdir -p "${home_dir}/.local/bin"
-
-packages=(
-    spotdl
-    yt-dlp
-    youtube-dl
-)
-
-for package in "${packages[@]}"; do
-
-    echo "Checking package: ${package}"
-
-    if ! "${venv_dir}/bin/pip3" show "$package" >/dev/null 2>&1; then
-
-        echo "Installing ${package}"
-
-        "${venv_dir}/bin/pip3" install "$package"
-
-    else
-
-        echo "Updating ${package}"
-
-        "${venv_dir}/bin/pip3" install --upgrade "$package"
-    fi
-
-    if [[ -x "${venv_dir}/bin/${bin}" ]]; then
-    
-        ln -sf "${venv_dir}/bin/${package}" "${home_dir}/.local/bin/${package}"
-    
-    fi
-    if [[ $? -eq 0 ]]; then
-        write_out "${package}                [${green}OK${norm}]"
-    else
-        write_out "${package}                [${red}FAIL${norm}]"
-    fi
-done
-
 ###############################################################################
 # Docker Updates
 ###############################################################################