From 046d4b8d9d1392967fcdb04405122c5db5ef79e0 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 29 Feb 2016 15:51:25 +0100 Subject: [PATCH] Move check label earlier --- softwares/FWSUpdates/bin/chkupd.bat | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/softwares/FWSUpdates/bin/chkupd.bat b/softwares/FWSUpdates/bin/chkupd.bat index 81b2ae4..bd66e79 100644 --- a/softwares/FWSUpdates/bin/chkupd.bat +++ b/softwares/FWSUpdates/bin/chkupd.bat @@ -148,6 +148,15 @@ goto :EOF :previous goto :loop +:check +IF %ADMIN% NEQ 1 goto later +SET watext=%L_CHECKING_UPDATES% +start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe PB OPEN NOBACK NOCANCEL +start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe PB UPDATE 10 +CALL %~dp0\sync.bat +start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe PB CLOSE +goto begin + :later reg del "HKLM\Software\FWS\Updates\User" /v RunOnShutdown /f 1>NUL 2>NUL IF %ADMIN% EQU 1 reg del "HKLM\Software\FWS\Updates" /v RunOnShutdown /f 1>NUL 2>NUL @@ -176,13 +185,6 @@ SET watext=%L_UPDATES_FINISHED% start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe FINISH NOBACK NOCANCEL TB goto :loop -:check -IF %ADMIN% NEQ 1 goto later -SET watext=%L_CHECKING_UPDATES% -start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe PB OPEN NOBACK NOCANCEL -start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe PB UPDATE 10 -CALL %~dp0\sync.bat -start /w %SystemDrive%\FWSUpdates\bin\wizapp.exe PB CLOSE -goto begin +