Changeset 72049 in vbox for trunk

Timestamp:

Apr 27, 2018 8:38:20 AM (7 years ago)

Author:

vboxsync

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

122396

Message:

Installer/win: Some repacking script fixes. bugref:8691

Location:

trunk/src/VBox/Installer/win/Scripts

Files:

• Combined-3-Repack.cmd (modified) (2 diffs)
• UnpackBlessedDrivers.cmd (modified) (2 diffs)

trunk/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd

@@ -34 +34 @@
 rem
 set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\..\..\
-for %i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%~fi
+for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
 set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
@@ -186 +186 @@
 
 if not exist "%_MY_OPT_EXTPACK%"        goto error_extpack_not_found
-if not ".%_MY_OPT_EXTPACK_ENTERPRISE" == "." if not exist "%_MY_OPT_EXTPACK_ENTERPRISE%" goto error_enterprise_extpack_not_found
+if not ".%_MY_OPT_EXTPACK_ENTERPRISE%" == "." if not exist "%_MY_OPT_EXTPACK_ENTERPRISE%" goto error_enterprise_extpack_not_found
 
 if not exist "%_MY_OPT_SIGNED_AMD64%"   goto error_signed_amd64_not_found

trunk/src/VBox/Installer/win/Scripts/UnpackBlessedDrivers.cmd

@@ -135 +135 @@
 rem Modify the catalog signatures.
 rem
+if "%_MY_OPT_SIGN_CAT%" == "0" goto no_sign_cat
 for %%d in (%_MY_DRIVER_BASE_NAMES%) do (
     copy /y "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
@@ -140 +141 @@
     "%_MY_OPT_BINDIR%\tools\RTSignTool.exe"  add-nested-exe-signature -v "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
 )
-
+:no_sign_cat
 goto end