diff options
| author | Noah Andrews <NoahAndrews@users.noreply.github.com> | 2016-06-27 09:52:01 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-06-27 09:52:01 -0400 |
| commit | 1b04e9d01ec4d31db3eaddf442c23e10b907c546 (patch) | |
| tree | df3859e8fae98f206d722f89de7fce611c2a5a11 /util/1-setup-path-win.bat | |
| parent | 57066b12464a7d1d7f12dec573f4691587d559a6 (diff) | |
| download | qmk_firmware-1b04e9d01ec4d31db3eaddf442c23e10b907c546.tar.gz qmk_firmware-1b04e9d01ec4d31db3eaddf442c23e10b907c546.zip | |
Long overdue fixes and improvements to environment setup scripts (#448)
* Update setup script 1 for new folder structure
* Improve script 1 output
* Launch elevate if run without admin privileges
* Improve MinGW error message
* Improvements and fixes to second script
* Log elevate output in first script
Diffstat (limited to 'util/1-setup-path-win.bat')
| -rw-r--r-- | util/1-setup-path-win.bat | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/util/1-setup-path-win.bat b/util/1-setup-path-win.bat index 92e91be3e..699aee215 100644 --- a/util/1-setup-path-win.bat +++ b/util/1-setup-path-win.bat | |||
| @@ -2,12 +2,12 @@ | |||
| 2 | @ECHO OFF | 2 | @ECHO OFF |
| 3 | SET CMDLINERUNSTR=%SystemRoot%\system32\cmd.exe | 3 | SET CMDLINERUNSTR=%SystemRoot%\system32\cmd.exe |
| 4 | 4 | ||
| 5 | CD UTIL | 5 | DEL script1.log > NUL 2>&1 |
| 6 | DEL add-paths.log > NUL 2>&1 | 6 | DEL add-paths.log > NUL 2>&1 |
| 7 | DEL add-paths-detail.log > NUL 2>&1 | 7 | DEL add-paths-detail.log > NUL 2>&1 |
| 8 | DEL UPDATE > NUL 2>&1 | 8 | DEL UPDATE > NUL 2>&1 |
| 9 | 9 | ||
| 10 | ELEVATE -wait %cd%\add-paths.bat > NUL 2>&1 | 10 | ELEVATE -wait add-paths.bat >> script1.log 2>&1 |
| 11 | 11 | ||
| 12 | IF ERRORLEVEL 1 ( | 12 | IF ERRORLEVEL 1 ( |
| 13 | ECHO You denied admin access. Rerun the script, and be sure to press the yes button this time. | 13 | ECHO You denied admin access. Rerun the script, and be sure to press the yes button this time. |
| @@ -44,9 +44,14 @@ EXIT /b | |||
| 44 | :: ----------------------------------------------------------------------------- | 44 | :: ----------------------------------------------------------------------------- |
| 45 | 45 | ||
| 46 | :KillExplorer | 46 | :KillExplorer |
| 47 | ECHO. | ||
| 48 | ECHO. | ||
| 47 | ECHO Your desktop will be restarted. | 49 | ECHO Your desktop will be restarted. |
| 50 | ECHO. | ||
| 48 | ECHO All file explorer windows except for the one you launched this script from WILL BE CLOSED. | 51 | ECHO All file explorer windows except for the one you launched this script from WILL BE CLOSED. |
| 52 | ECHO. | ||
| 49 | ECHO Press enter when ready, or close this window if you would rather do a full restart of your computer at a later time. | 53 | ECHO Press enter when ready, or close this window if you would rather do a full restart of your computer at a later time. |
| 54 | ECHO. | ||
| 50 | PAUSE | 55 | PAUSE |
| 51 | ping -n 5 127.0.0.1 > NUL 2>&1 | 56 | ping -n 5 127.0.0.1 > NUL 2>&1 |
| 52 | ECHO Killing process Explorer.exe. . . | 57 | ECHO Killing process Explorer.exe. . . |
| @@ -57,5 +62,5 @@ ECHO Your desktop is now loading. . . | |||
| 57 | ECHO. | 62 | ECHO. |
| 58 | ping -n 5 127.0.0.1 > NUL 2>&1 | 63 | ping -n 5 127.0.0.1 > NUL 2>&1 |
| 59 | START explorer.exe | 64 | START explorer.exe |
| 60 | START explorer.exe %CD%\.. | 65 | START explorer.exe %CD% |
| 61 | EXIT /b \ No newline at end of file | 66 | EXIT /b \ No newline at end of file |
