From 21c4af26642461ae940d84967e0e2031d53bc926 Mon Sep 17 00:00:00 2001 From: bryan Date: Tue, 3 Sep 2024 20:37:58 -0400 Subject: [PATCH] Fix Linux Mint codename --- installJRMC | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/installJRMC b/installJRMC index 30cf32e..74a8c03 100755 --- a/installJRMC +++ b/installJRMC @@ -1627,6 +1627,8 @@ update_self() { fi fi + echo HERE2 + # Download the latest version of the script install_package --silent wget if command -v wget &>/dev/null; then @@ -1637,34 +1639,33 @@ update_self() { return 1 fi - # Extract and normalize versions inline without subshells - local local_version="" - while IFS= read -r line; do - echo $line - 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 + echo HERE3 - 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 + declare -p - echo HERE4 + # Extract and normalize versions using grep + 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} - [[ -z $remote_version ]] && { rm -f "$tmp"; return 1; } + local remote_version + grep -m 1 'SCRIPT_VERSION=' "$SCRIPT_PATH" + 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" + + [[ -z $remote_version ]] && { rm -f "$tmp"; return 1; } + + echo HERE5 if [[ $local_version < $remote_version ]]; then