Tweak OS version checking section to handle minor OS revisions better

DJ2LS · Sep 14, 2024 · 50d9672 · 50d9672
1 parent f50cfec
commit 50d9672
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/tools/Linux/install-freedata-linux.sh b/tools/Linux/install-freedata-linux.sh
@@ -19,11 +19,14 @@
 #
 #
 # Changelog:
-# 1.8   23 July 2024 ( DJ2LS )
-# Add support for browser based gui
+# 1.9:	14 Sep 2024 (deej)
+# 	Tweak OS version checking section to handle minor OS revisions better
+
+# 1.8:	23 July 2024 ( DJ2LS )
+# 	Add support for browser based gui
 #
-# 1.7   31 May 2024 ( DJ2LS )
-# Add support for version specific setup
+# 1.7:	31 May 2024 ( DJ2LS )
+# 	Add support for version specific setup
 #
 # 1.6:	22 May 2024
 #	Reflect directory name changes in prep for merging develop to main
@@ -70,7 +73,7 @@ case $1 in
 esac
 
 osname=`grep -E '^(NAME)=' /etc/os-release | cut -d\" -f2`
-osversion=`grep -E '^(VERSION)=' /etc/os-release | cut -d\" -f2`
+osversion=`grep -E '^(VERSION_ID)=' /etc/os-release | cut -d\" -f2`
 
 echo "Running on" $osname "version" $osversion
 
@@ -82,7 +85,7 @@ echo "*************************************************************************"
 case $osname in
    "Debian GNU/Linux")
 	case $osversion in
-	   "11 (bullseye)" | "12 (bookworm)")
+	   "11" | "12")
 		sudo apt install --upgrade -y fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv wget
 	   ;;
 
@@ -100,7 +103,7 @@ case $osname in
 
    "Ubuntu")
 	case $osversion in
-	   "22.04.4 LTS (Jammy Jellyfish)" | "24.04 LTS (Noble Numbat)")
+	   "22.04" | "24.04")
 		sudo apt install --upgrade -y fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv wget
 	   ;;