1
0

Merge pull request #275 from claustromaniac/claustromaniac-patch-1

Just some polishing
This commit is contained in:
earthlng 2017-11-19 22:32:06 +01:00 committed by GitHub
commit 4290b4e882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,7 +3,7 @@ TITLE ghacks user.js updater
REM ### ghacks-user.js updater for Windows REM ### ghacks-user.js updater for Windows
REM ## author: @claustromaniac REM ## author: @claustromaniac
REM ## version: 2.0 REM ## version: 2.1
SETLOCAL EnableDelayedExpansion SETLOCAL EnableDelayedExpansion
SET "_ua=" SET "_ua="
@ -42,7 +42,7 @@ ECHO.
IF NOT "%_ua%"=="true" ( IF NOT "%_ua%"=="true" (
ECHO This batch should be run from your Firefox profile directory. It will download the latest version of ghacks user.js from github and then append any of your own changes from user-overrides.js to it. ECHO This batch should be run from your Firefox profile directory. It will download the latest version of ghacks user.js from github and then append any of your own changes from user-overrides.js to it.
ECHO. ECHO.
REM Visit the wiki for more detailed information. REM ECHO Visit the wiki for more detailed information.
REM ECHO. REM ECHO.
CHOICE /M "Continue" CHOICE /M "Continue"
IF ERRORLEVEL 2 GOTO end IF ERRORLEVEL 2 GOTO end
@ -50,11 +50,9 @@ IF NOT "%_ua%"=="true" (
CLS CLS
ECHO. ECHO.
IF "%_log%"=="true" ( IF "%_log%"=="true" (
CALL :log >>user.js-update-log.txt CALL :log >>user.js-update-log.txt 2>&1
EXIT /B EXIT /B
) :log
:log
IF "%_log%"=="true" (
ECHO ################################################################## ECHO ##################################################################
ECHO. ECHO.
ECHO %date%, %time% ECHO %date%, %time%
@ -67,7 +65,7 @@ IF EXIST user.js (
ECHO. ECHO.
) )
ECHO Retrieving latest user.js file from ghacks github repository... ECHO Retrieving latest user.js file from ghacks github repository...
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/ghacksuserjs/ghacks-user.js/raw/master/user.js', 'user.js')" powershell -Command "(New-Object Net.WebClient).DownloadFile('https://github.com/ghacksuserjs/ghacks-user.js/raw/master/user.js', 'user.js')" >nul
ECHO. ECHO.
IF EXIST user.js ( IF EXIST user.js (
IF EXIST "user-overrides.js" ( IF EXIST "user-overrides.js" (
@ -103,7 +101,7 @@ IF EXIST user.js (
ECHO No changes were made. ECHO No changes were made.
ECHO. ECHO.
) )
:end
IF NOT "%_log%"=="true" ( IF NOT "%_log%"=="true" (
IF NOT "%_ua%"=="true" PAUSE IF NOT "%_ua%"=="true" PAUSE
) )
:end