From 98aa2bc88524404035e8ecda4d2c34984ac6a0bb Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 26 Aug 2016 12:26:51 +0200
Subject: [PATCH] Upgrade in the fwsupdates.vbs script

---
 packages/fwsupdates.xml       | 4 +---
 softwares/fwsupdates.vbs      | 5 +++++
 softwares/offline_upgrade.bat | 4 ----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/fwsupdates.xml b/packages/fwsupdates.xml
index 9a926c9..0f4dddd 100755
--- a/packages/fwsupdates.xml
+++ b/packages/fwsupdates.xml
@@ -6,12 +6,11 @@
              reboot="false"
              priority="95">
  
-        <variable name="PKG_VERSION" value="1.13" />
+        <variable name="PKG_VERSION" value="1.14" />
  
         <check type="registry" condition="equals" path="HKLM\Software\FWS\Updates\ClientVersion" value="%PKG_VERSION%" />
  
         <install cmd='%COMSPEC% /C if not exist "%SYSTEMROOT%\system32\GroupPolicy\Machine\Scripts\Shutdown" mkdir "%SYSTEMROOT%\system32\GroupPolicy\Machine\Scripts\Shutdown"' />
-        <install cmd='%COMSPEC% /C copy /Y "%SOFTWARE%\fwsupdates\fwsupdates.vbs" "%SYSTEMROOT%\system32\GroupPolicy\Machine\Scripts\Shutdown\fwsupdates.upgrade.vbs"' />
         <install cmd='%COMSPEC% /C if not exist "%SystemDrive%\FWSUpdates" mkdir "%SystemDrive%\FWSUpdates"' />
         <install cmd='%COMSPEC% /C xcopy /I /E /Y "%SOFTWARE%\fwsupdates\FWSUpdates\assets" "%SystemDrive%\FWSUpdates\assets.upgrade"' />
         <install cmd='%COMSPEC% /C xcopy /I /E /Y "%SOFTWARE%\fwsupdates\FWSUpdates\bin" "%SystemDrive%\FWSUpdates\bin.upgrade"' />
@@ -36,7 +35,6 @@
         <install cmd='cscript //Nologo "%SOFTWARE%\fwsupdates\create_shortcut.vbs' />
         <install cmd='cscript //Nologo "%SOFTWARE%\fwsupdates\localgp.vbs" fwsupdates.vbs false MACHINE' />
         <install cmd='schtasks.exe /Create /tn "sync_wpkg" /sc hourly /mo 3 /ru "SYSTEM" /tr "%SystemDrive%\FWSUpdates\bin\delayed_sync.bat" /f' />
-        <install cmd='reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce" /v WPKGUpgrade /t REG_SZ /d "cmd.exe /c \"%SystemDrive%\FWSUpdates\offline_upgrade.bat\"" /f' />
         <install cmd='%COMSPEC% /C echo reg add "HKLM\Software\FWS\Updates" /v "ClientVersion" /t REG_SZ /d "%PKG_VERSION%" /f &gt;&gt; %SystemDrive%\FWSUpdates\offline_upgrade.bat' />
         <install cmd='%COMSPEC% /C echo cscript "%SystemDrive%\FWSUpdates\repository\wpkg.js" /nonotify /upgrade:fwsupdates &gt;&gt; %SystemDrive%\FWSUpdates\offline_upgrade.bat' />
 
diff --git a/softwares/fwsupdates.vbs b/softwares/fwsupdates.vbs
index 13188fd..1aaf286 100644
--- a/softwares/fwsupdates.vbs
+++ b/softwares/fwsupdates.vbs
@@ -1,2 +1,7 @@
 Set objShell = CreateObject("Wscript.Shell")
+Set fsObject = CreateObject("Scripting.FileSystemObject")
 objShell.Run """" & objShell.ExpandEnvironmentStrings("%SYSTEMDRIVE%") & "\FWSUpdates\bin\on_shutdown.bat" & """", 0, True
+If fsObject.FileExists(objShell.ExpandEnvironmentStrings("%SYSTEMDRIVE%") & "\FWSUpdates\offline_upgrade.bat") Then
+    objShell.Run """" & objShell.ExpandEnvironmentStrings("%SYSTEMDRIVE%") & "\FWSUpdates\offline_upgrade.bat" & """", 0, True
+    fsObject.DeleteFile(objShell.ExpandEnvironmentStrings("%SYSTEMDRIVE%") & "\FWSUpdates\offline_upgrade.bat")
+End If
diff --git a/softwares/offline_upgrade.bat b/softwares/offline_upgrade.bat
index 15b19f5..ff2b401 100644
--- a/softwares/offline_upgrade.bat
+++ b/softwares/offline_upgrade.bat
@@ -15,9 +15,5 @@ IF EXIST "%SystemDrive%\FWSUpdates\lang.upgrade" (
   RENAME "%SystemDrive%\FWSUpdates\lang.upgrade" lang
 )
 IF EXIST "%SystemRoot%\System32\GroupPolicy\Machine\Scripts\Shutdown\wpkg.bat" DEL /F /Q "%SystemRoot%\System32\GroupPolicy\Machine\Scripts\Shutdown\wpkg.bat"
-IF EXIST "%SystemRoot%\System32\GroupPolicy\Machine\Scripts\Shutdown\fwsupdates.upgrade.vbs" (
-  DEL /Q "%SystemRoot%\System32\GroupPolicy\Machine\Scripts\Shutdown\fwsupdates.vbs"
-  RENAME "%SystemRoot%\System32\GroupPolicy\Machine\Scripts\Shutdown\fwsupdates.upgrade.vbs" fwsupdates.vbs
-)
 reg delete "HKLM\Software\FWS\Updates" /v PendingChanges /f
 reg delete "HKLM\Software\FWS\Updates" /v PendingChangesList /f