user.js

commit 28f06b41e3e57f006d3e38f6d1e57dd565e99527
parent f8ec9cebdd382350f5a8fbfce1d2cb987cbbb9b1
Author: earthlng <earthlng@users.noreply.github.com>
Date:   Sun, 10 Dec 2017 15:55:15 +0100

Merge pull request #309 from claustromaniac/master

Updater for Windows 3.2
Diffstat:
M
updater.bat
 | 
35
++++++++++++++++-------------------

1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/updater.bat b/updater.bat
@@ -3,7 +3,7 @@ TITLE ghacks user.js updater
 
 REM ### ghacks-user.js updater for Windows
 REM ## author: @claustromaniac
-REM ## version: 3.1
+REM ## version: 3.2
 
 SET _myname=%~n0
 SET _myparams=%*
@@ -39,11 +39,10 @@ IF DEFINED _updateb (
 	REM The normal flow here goes from phase 1 to phase 2 and then phase 3.
 	IF NOT "!_myname:~0,9!"=="[updated]" (
 		IF EXIST "[updated]!_myname!.bat" (
-			REM Phase 3
-			REM The new script, with the original name, should:
-			REM 	Delete the [updated]*.bat script
-			REM 	Begin the normal script routine.
-			REN [updated]!_myname!.bat [updated]!_myname!.bat.old
+			REM ## Phase 3 ##: The new script, with the original name, will:
+			REM 	* Delete the [updated]*.bat script
+			REM 	* Begin the normal routine
+			REN "[updated]!_myname!.bat" "[updated]!_myname!.bat.old"
 			DEL /F "[updated]!_myname!.bat.old"
 			ECHO Script updated^^!
 			ECHO.
@@ -52,11 +51,10 @@ IF DEFINED _updateb (
 			ECHO.
 			GOTO begin
 		)
-		REM Phase 1
-		REM -updatebatch will:
-		REM 	Download new batch and name it [updated]*.bat
-		REM 	Open that script in a new CMD window.
-		REM 	Exit
+		REM ## Phase 1 ##
+		REM 	* Download new batch and name it [updated]*.bat
+		REM 	* Start that script in a new CMD window
+		REM 	* Exit
 		ECHO Updating script...
 		ECHO.
 		REM Uncomment the next line and comment the powershell call for testing.
@@ -79,14 +77,13 @@ IF DEFINED _updateb (
 			ECHO.
 			TIMEOUT 300 >nul
 		) ELSE (
-			REM Phase 2
-			REM The [updated]*.bat script will:
-			REM 	Copy itself overwriting the original batch.
-			REM 	Start that script in a new CMD instance.
-			REM 	Exit.
-			IF EXIST !_myname:~9!.bat (
-				REN !_myname:~9!.bat !_myname:~9!.bat.old
-				DEL /F !_myname:~9!.bat.old
+			REM ## Phase 2 ##: The [updated]*.bat script will:
+			REM 	* Copy itself overwriting the original batch
+			REM 	* Start that script in a new CMD instance
+			REM 	* Exit
+			IF EXIST "!_myname:~9!.bat" (
+				REN "!_myname:~9!.bat" "!_myname:~9!.bat.old"
+				DEL /F "!_myname:~9!.bat.old"
 			)
 			COPY /B /V /Y "!_myname!.bat" "!_myname:~9!.bat"
 			START CMD /C "!_myname:~9!.bat" !_myparams!