Changeset 54137 in vbox for trunk/src/VBox/HostDrivers/win/loadall.sh

Timestamp:

Feb 11, 2015 11:56:47 AM (10 years ago)

Author:

vboxsync

Message:

Seems aleksey forgot to update these scripts...

File:

• trunk/src/VBox/HostDrivers/win/loadall.sh (modified) (5 diffs)

trunk/src/VBox/HostDrivers/win/loadall.sh

@@ -35 +35 @@
 # Query the status of the drivers.
 #
-for drv in VBoxNetAdp VBoxNetFlt VBoxUSBMon VBoxUSB VBoxDrv;
+for drv in VBoxNetAdp VBoxNetAdp6 VBoxNetFlt VBoxNetLwf VBoxUSBMon VBoxUSB VBoxDrv;
 do
     if sc query $drv > /dev/null; then
@@ -44 +44 @@
                          -e 's/ *$//g' \
               `
-        echo "load.sh: $drv - $STATE"
+        echo "loadall.sh: $drv - $STATE"
     else
-        echo "load.sh: $drv - not configured, probably."
+        echo "loadall.sh: $drv - not configured, probably."
     fi
 done
@@ -56 +56 @@
 # Invoke the uninstallers.
 #
-for uninst in NetAdpUninstall.exe NetFltUninstall.exe USBUninstall.exe SUPUninstall.exe;
+for uninst in NetAdpUninstall.exe NetAdp6Uninstall.exe USBUninstall.exe NetFltUninstall.exe NetLwfUninstall.exe SUPUninstall.exe;
 do
     if test -f ${MY_DIR}/$uninst; then
@@ -67 +67 @@
 #
 if test "$1" != "-u" -a "$1" != "--uninstall"; then
-    for inst in SUPInstall.exe USBInstall.exe NetFltInstall.exe ; #NetAdpInstall.exe; - busted
+    INSTALLERS="SUPInstall.exe USBInstall.exe";
+    VER=`cmd.exe /c ver`
+    VER=`echo "$VER" | kmk_sed -e 's/^.*\[[^0-9]* \(.*\)\]/\1/' -e '/^$/d`
+    case "$VER" in
+        6.*|10.*|11.*|12.*)
+            INSTALLERS="$INSTALLERS NetLwfInstall.exe"; #NetAdp6Install.exe - also busted?
+            ;;
+        *)
+            INSTALLERS="$INSTALLERS NetFltInstall.exe"; #NetAdpInstall.exe; - busted
+            ;;
+    esac
+
+    for inst in $INSTALLERS;
     do
         if test -f ${MY_DIR}/$inst; then
@@ -75 +87 @@
 fi
 
-echo "load.sh: Successfully installed all drivers"
+echo "loadall.sh: Successfully installed all drivers"
 exit 0