Including OS codename info in install scripts

Author: ChrisMaunder

modules/ObjectDetectionYOLOv5-6.2/install.sh

@@ -79,7 +79,7 @@ fi
 
 # OpenCV needs a specific version for macOS 11
 # https://github.com/opencv/opencv-python/issues/777#issuecomment-1879553756
-if [ "$os_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
+if [ "$os_code_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
     installPythonPackagesByName "opencv-python==4.6.0.66" "OpenCV 4.6.0.66 for macOS 11.x"
 fi
 

src/SDK/Python/src/codeproject_ai_sdk/module_runner.py

@@ -1279,7 +1279,7 @@ def get_requirements_filepath(self) -> str:
         # then GPU, then CPU. With a query at each step for OS and architecture.
 
         filename = ""
-        os_name  = self.system_info.os.lower()
+        os       = self.system_info.os.lower()
         arch     = self.system_info.cpu_arch.lower()
 
         if self.system_info.system == 'Raspberry Pi':
@@ -1302,34 +1302,34 @@ def get_requirements_filepath(self) -> str:
 
             if self.system_info.hasTorchCuda:
                 # TODO: Get the specific CUDA version and then add tests for .cudaMajor, .cudaMajor_Minor
-                if os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.{arch}.cuda.txt")):
-                    filename = f"requirements.{os_name}.{arch}.cuda.txt"
-                elif os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.cuda.txt")):
-                    filename = f"requirements.{os_name}.cuda.txt"
+                if os.path.exists(os.path.join(self.module_path, f"requirements.{os}.{arch}.cuda.txt")):
+                    filename = f"requirements.{os}.{arch}.cuda.txt"
+                elif os.path.exists(os.path.join(self.module_path, f"requirements.{os}.cuda.txt")):
+                    filename = f"requirements.{os}.cuda.txt"
                 elif os.path.exists(os.path.join(self.module_path, f"requirements.cuda.txt")):
                     filename = f"requirements.cuda.txt"
 
             if self.system_info.hasTorchROCm:
-                if os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.{arch}.rocm.txt")):
-                    filename = f"requirements.{os_name}.{arch}.rocm.txt"
-                elif os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.rocm.txt")):
-                    filename = f"requirements.{os_name}.rocm.txt"
+                if os.path.exists(os.path.join(self.module_path, f"requirements.{os}.{arch}.rocm.txt")):
+                    filename = f"requirements.{os}.{arch}.rocm.txt"
+                elif os.path.exists(os.path.join(self.module_path, f"requirements.{os}.rocm.txt")):
+                    filename = f"requirements.{os}.rocm.txt"
                 elif os.path.exists(os.path.join(self.module_path, f"requirements.rocm.txt")):
                     filename = f"requirements.rocm.txt"
 
             if not filename:
-                if os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.{arch}.gpu.txt")):
-                    filename = f"requirements.{os_name}.{arch}.gpu.txt"
-                elif os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.gpu.txt")):
-                    filename = f"requirements.{os_name}.gpu.txt"
+                if os.path.exists(os.path.join(self.module_path, f"requirements.{os}.{arch}.gpu.txt")):
+                    filename = f"requirements.{os}.{arch}.gpu.txt"
+                elif os.path.exists(os.path.join(self.module_path, f"requirements.{os}.gpu.txt")):
+                    filename = f"requirements.{os}.gpu.txt"
                 elif os.path.exists(os.path.join(self.module_path, f"requirements.gpu.txt")):
                     filename = f"requirements.gpu.txt"
 
         if not filename:
-            if os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.{arch}.txt")):
-                filename = f"requirements.{os_name}.{arch}.txt"
-            elif os.path.exists(os.path.join(self.module_path, f"requirements.{os_name}.txt")):
-                filename = f"requirements.{os_name}.txt"
+            if os.path.exists(os.path.join(self.module_path, f"requirements.{os}.{arch}.txt")):
+                filename = f"requirements.{os}.{arch}.txt"
+            elif os.path.exists(os.path.join(self.module_path, f"requirements.{os}.txt")):
+                filename = f"requirements.{os}.txt"
             elif os.path.exists(os.path.join(self.module_path, f"requirements.txt")):
                 filename = f"requirements.txt"
 

src/SDK/install.sh

@@ -69,7 +69,7 @@ if [ "$os" = "linux" ]; then
 else
     if [ "${verbosity}" = "quiet" ]; then
 
-        if [ "$os_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
+        if [ "$os_code_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
             writeLine "** Installing System.Drawing support. On macOS 11 this could take a looong time" "$color_warn"
         else
             write "Installing System.Drawing support "

src/demos/clients/install.sh

@@ -30,7 +30,7 @@ setupPython
 
 # OpenCV needs a specific version for macOS 11
 # https://github.com/opencv/opencv-python/issues/777#issuecomment-1879553756
-if [ "$os_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
+if [ "$os_code_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
     installPythonPackagesByName "opencv-python==4.6.0.66" "OpenCV 4.6.0.66 for macOS 11.x"
 fi
 

src/demos/modules/PythonSimple/install.sh

@@ -21,7 +21,7 @@ fi
 
 # OpenCV needs a specific version for macOS 11
 # https://github.com/opencv/opencv-python/issues/777#issuecomment-1879553756
-if [ "$os_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
+if [ "$os_code_name" = "Big Sur" ]; then   # macOS 11.x on Intel, kernal 20.x
     installPythonPackagesByName "opencv-python==4.6.0.66" "OpenCV 4.6.0.66 for macOS 11.x"
 fi