Browse Source

Fix Linux Mint codename

bryan 1 month ago
parent
commit
b5357b982b
1 changed files with 15 additions and 28 deletions
  1. 15 28
      installJRMC

+ 15 - 28
installJRMC

@@ -1606,6 +1606,17 @@ update_self() {
 
     echo "Checking for installJRMC update"
 
+    # Function to extract and normalize version from a script
+    extract_version() {
+        local version_line
+        version_line=$(grep -m 1 'SCRIPT_VERSION=' "$1")
+        version_line=${version_line#*=}
+        version_line=${version_line#\"}
+        version_line=${version_line%-dev\"}
+        version_line=${version_line%\"}
+        echo "$version_line"
+    }
+
     # Check if we're in a git directory and if it's the installJRMC repository
     if git -C "$SCRIPT_DIR" rev-parse --is-inside-work-tree &>/dev/null \
     && [[ "$(git -C "$SCRIPT_DIR" config --get remote.origin.url)" == *"bryan/installJRMC"* ]]; then
@@ -1627,8 +1638,6 @@ update_self() {
         fi
     fi
 
-    echo HERE2
-
     # Download the latest version of the script
     install_package --silent wget
     if command -v wget &>/dev/null; then
@@ -1639,36 +1648,16 @@ update_self() {
         return 1
     fi
 
-    echo HERE3
-
-    declare -p
-
-    # Extract and normalize versions using grep
+    # Compare versions and update if necessary
     local local_version
-    grep -m 1 'SCRIPT_VERSION=' "$SCRIPT_PATH"
-    local_version=$(grep -m 1 'SCRIPT_VERSION=' "$SCRIPT_PATH")
-    local_version=${local_version#*=}
-    local_version=${local_version#\"}
-    local_version=${local_version%\"}
-    local_version=${local_version%-dev}
-
+    local_version=$(extract_version "$SCRIPT_PATH")
     local remote_version
-    cat $tmp
-    grep -m 1 'SCRIPT_VERSION=' "$tmp"
-    remote_version=$(grep -m 1 'SCRIPT_VERSION=' "$tmp")
-    remote_version=${remote_version#*=}
-    remote_version=${remote_version#\"}
-    remote_version=${remote_version%\"}
-    remote_version=${remote_version%-dev}
-
-    echo "$remote_version, $local_version"
+    remote_version=$(extract_version "$tmp")
 
+    debug HERE
 
     [[ -z $remote_version ]] && { rm -f "$tmp"; return 1; }
 
-    
-    echo HERE5
-
     if [[ $local_version < $remote_version ]]; then
         echo "Newer version of installJRMC found. Updating..."
         execute mv "$tmp" "$SCRIPT_PATH"
@@ -1680,8 +1669,6 @@ update_self() {
 }
 
 
-
-
 main() {
     debug "Running: ${FUNCNAME[0]} $*"