Changeset 43998 in vbox for trunk/src/VBox/Additions/solaris/Installer

Timestamp:

Nov 29, 2012 4:15:22 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

82387

Message:

Solaris/Additions: Ship X.Org 1.13 drivers and fixed the installer to handle X.Org versions more generically.

File:

• trunk/src/VBox/Additions/solaris/Installer/postinstall.sh (modified) (3 diffs)

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -49 +49 @@
 }
 
+# uncompress_files(directory_with_*.Z_files)
 uncompress_files()
 {
-    # VBox guest files
-    uncompress_file "$1" "VBoxClient"
-    uncompress_file "$1" "VBoxService"
-    uncompress_file "$1" "VBoxControl"
-
-    # VBox Xorg Video drivers
-    uncompress_file "$1" "vboxvideo_drv_13.so"
-    uncompress_file "$1" "vboxvideo_drv_14.so"
-    uncompress_file "$1" "vboxvideo_drv_15.so"
-    uncompress_file "$1" "vboxvideo_drv_16.so"
-    uncompress_file "$1" "vboxvideo_drv_17.so"
-    uncompress_file "$1" "vboxvideo_drv_18.so"
-    uncompress_file "$1" "vboxvideo_drv_19.so"
-    uncompress_file "$1" "vboxvideo_drv_110.so"
-    uncompress_file "$1" "vboxvideo_drv_111.so"
-    uncompress_file "$1" "vboxvideo_drv_112.so"
-    uncompress_file "$1" "vboxvideo_drv_70.so"
-    uncompress_file "$1" "vboxvideo_drv_71.so"
+    for i in "${1}/"*.Z; do
+        uncompress_file "${1}" "`basename \"${i}\" .Z`"
+    done
 }
 
@@ -144 +130 @@
     fi
 
-    vboxvideo_src=""
-
+    # "X.Y.Z" - strip off all numerics after the 2nd '.' character, e.g. "1.11.3" -> "1.11"
+    # Then the next sed, strips of all '.' characters, "1.11" -> "111".
+    fileversion=`echo $xorgversion | sed "s/\.[0-9]*//2" | sed "s/\.//"`
+    vboxvideo_src="vboxvideo_drv_$fileversion.so"
+
+    # Handle exceptions now where the X.org version does not exactly match the file-version.
     case "$xorgversion" in
-        1.3.* )
-            vboxvideo_src="vboxvideo_drv_13.so"
-            ;;
-        1.4.* )
-            vboxvideo_src="vboxvideo_drv_14.so"
-            ;;
-        1.5.99 | 1.6.* )
+        1.5.99 )
             vboxvideo_src="vboxvideo_drv_16.so"
             ;;
-        1.5.* )
-            vboxvideo_src="vboxvideo_drv_15.so"
-            ;;
-        1.7.*)
-            vboxvideo_src="vboxvideo_drv_17.so"
-            ;;
-        1.8.*)
-            vboxvideo_src="vboxvideo_drv_18.so"
-            ;;
-        1.9.*)
-            vboxvideo_src="vboxvideo_drv_19.so"
-            ;;
-        1.10.*)
-            vboxvideo_src="vboxvideo_drv_110.so"
-            ;;
-        1.11.*)
-            vboxvideo_src="vboxvideo_drv_111.so"
-            ;;
-        1.12.*)
-            vboxvideo_src="vboxvideo_drv_112.so"
-            ;;
-        7.1.* | *7.2.* )
+        7.2.* )
             vboxvideo_src="vboxvideo_drv_71.so"
             ;;
-        6.9.* | 7.0.* )
+        6.9.* )
             vboxvideo_src="vboxvideo_drv_70.so"
             ;;
@@ -189 +152 @@
         echo "*** Unknown version of the X Window System installed."
         echo "*** Failed to install the VirtualBox X Window System drivers."
+
+        # Exit as partially failed installation
+        retval=2
+    elif test ! -f "$vboxadditions32_path/$vboxvideo_src" && test ! -f "$vboxadditions64_path/$vboxvideo_src"; then
+        echo "*** $vboxadditions32_path/$vboxvideo_src or $vboxadditions64_path/$vboxvideo_src not found!"
+        echo "*** Failed to install the VirtualBox X.org drivers."
 
         # Exit as partially failed installation