Forráskód Böngészése

Fix Linux Mint codename

bryan 1 hónapja
szülő
commit
0b02edd338
1 módosított fájl, 21 hozzáadás és 20 törlés
  1. 21 20
      installJRMC

+ 21 - 20
installJRMC

@@ -1627,8 +1627,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,24 +1637,26 @@ update_self() {
         return 1
     fi
 
-    echo HERE3
-
-    declare -p
-
-    # Extract and normalize versions inline
-    local local_version
-    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 remote_version
-    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}
+    # Extract and normalize versions inline without subshells
+    local local_version=""
+    while IFS= read -r line; do
+        case "$line" in
+            *SCRIPT_VERSION=*) local_version=${line#*=}; break;;
+        esac
+    done < "$SCRIPT_PATH"
+    local_version=${local_version#\"}  # Remove leading '"'
+    local_version=${local_version%\"}  # Remove trailing '"'
+    local_version=${local_version%-dev}  # Remove '-dev' suffix
+
+    local remote_version=""
+    while IFS= read -r line; do
+        case "$line" in
+            *SCRIPT_VERSION=*) remote_version=${line#*=}; break;;
+        esac
+    done < "$tmp"
+    remote_version=${remote_version#\"}  # Remove leading '"'
+    remote_version=${remote_version%\"}  # Remove trailing '"'
+    remote_version=${remote_version%-dev}  # Remove '-dev' suffix
 
     echo HERE4
 
@@ -1678,6 +1678,7 @@ update_self() {
 
 
 
+
 main() {
     debug "Running: ${FUNCNAME[0]} $*"