Changeset 96696 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

Timestamp:

Sep 12, 2022 10:43:02 AM (2 years ago)

Author:

vboxsync

Message:

Add/Nt/Installer: Simplified the $g_bInstallTimestampCA stuff. (untested)

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -316 +316 @@
   ;
 
-  ; NSIS only supports global vars, even in functions -- great ;; @todo r=bird: why don't you just change $g_bInstallTimestampCA?
-  Var /GLOBAL bDoInstallCA
-  StrCpy $bDoInstallCA "false" ; Set a default value
-
   ; If not explicitly specified, let the detected Windows version decide what to do.
-  ${If} $g_bInstallTimestampCA == "unset"
-    ${If} $g_strWinVersion != "10"
-      ; On guest OSes < Windows 10 we always go for the PreW10 drivers and install our legacy timestamp CA.
-      StrCpy $bDoInstallCA "true"
-    ${EndIf}
-  ${Else}
-    StrCpy $bDoInstallCA $g_bInstallTimestampCA
-  ${EndIf}
-
-  ${If} $bDoInstallCA == "true"
+  ; On guest OSes < Windows 10 we always go for the PreW10 drivers and install our legacy timestamp CA.
+  ${If}    $g_bInstallTimestampCA == "unset"
+  ${AndIf} $g_strWinVersion != "10"
+      StrCpy $g_bInstallTimestampCA "true"
+  ${EndIf}
+
+  ${If} $g_bInstallTimestampCA == "true"
     ${LogVerbose} "Installing legacy timestamp CA certificate ..."
     ${CmdExecute} "$\"$INSTDIR\cert\VBoxCertUtil.exe$\" add-root $\"$INSTDIR\cert\vbox-legacy-timestamp-ca.cer$\"" 'non-zero-exitcode=log'