2 files changed, 28 insertions, 14 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 @@
 @ECHO OFF
 SET CMDLINERUNSTR=%SystemRoot%\system32\cmd.exe
-CD UTIL
+DEL script1.log > NUL 2>&1
 DEL add-paths.log > NUL 2>&1
 DEL add-paths-detail.log > NUL 2>&1
 DEL UPDATE > NUL 2>&1
-ELEVATE -wait %cd%\add-paths.bat > NUL 2>&1
+ELEVATE -wait add-paths.bat >> script1.log 2>&1
 IF ERRORLEVEL 1 (
        ECHO You denied admin access. Rerun the script, and be sure to press the yes button this time.
@@ -44,9 +44,14 @@ EXIT /b
 :: -----------------------------------------------------------------------------
 :KillExplorer
+ECHO.
+ECHO.
 ECHO Your desktop will be restarted. 
+ECHO.
 ECHO All file explorer windows except for the one you launched this script from WILL BE CLOSED.
+ECHO.
 ECHO Press enter when ready, or close this window if you would rather do a full restart of your computer at a later time.
+ECHO.
 PAUSE
 ping -n 5 127.0.0.1 > NUL 2>&1
 ECHO Killing process Explorer.exe. . . 
@@ -57,5 +62,5 @@ ECHO Your desktop is now loading. . .
 ECHO.   
 ping -n 5 127.0.0.1 > NUL 2>&1
 START explorer.exe
-START explorer.exe %CD%\..
+START explorer.exe %CD%
 EXIT /b
 \ No newline at end of file
diff --git a/util/2-setup-environment-win.bat b/util/2-setup-environment-win.bat
index 905338087..3e54cc776 100644
--- a/util/2-setup-environment-win.bat
+++ b/util/2-setup-environment-win.bat
@@ -1,46 +1,55 @@
 @SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
 @ECHO OFF
+CD %~dp0
 SET STARTINGDIR=%CD%
+echo %STARTINGDIR%
 :: Check for admin privilages
 SETX /M test test > nul 2>&1
 IF NOT ["%ERRORLEVEL%"]==["0"] (
-        ECHO FAILED. Rerun with administrator privileges.
+        ELEVATE -wait 2-setup-environment-win.bat & goto :EOF
-        GOTO ExitBatch
 ) 
+DEL %STARTINGDIR%\environment-setup.log
 :: Make sure path to MinGW exists - if so, CD to it
 SET MINGWPATH="C:\MinGW\bin"
-IF NOT EXIST !MINGWPATH! (ECHO Path not found: %MINGWPATH% && GOTO ExitBatch)
+IF NOT EXIST !MINGWPATH! (ECHO Path not found: %MINGWPATH%. Did you install MinGW to the default location? && GOTO ExitBatch)
 CD /D %MINGWPATH%
+ECHO.
 ECHO ------------------------------------------
 ECHO Installing wget and unzip
 ECHO ------------------------------------------
-mingw-get install msys-wget-bin msys-unzip-bin
+ECHO.
+mingw-get install msys-wget-bin msys-unzip-bin 
 MKDIR temp
 CD temp
+ECHO.
 ECHO ------------------------------------------
 ECHO Installing dfu-programmer.
 ECHO ------------------------------------------
-wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip
+ECHO.
-unzip dfu-programmer-win-0.7.2.zip
+wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip' >> %STARTINGDIR%\environment-setup.log
-COPY dfu-programmer.exe ..
+unzip -o dfu-programmer-win-0.7.2.zip >> %STARTINGDIR%\environment-setup.log
+COPY dfu-programmer.exe .. >> %STARTINGDIR%\environment-setup.log
 ECHO ------------------------------------------
 ECHO Downloading driver
 ECHO ------------------------------------------
-wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
+wget http://downloads.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log
-unzip libusb-win32-bin-1.2.6.0.zip
+unzip -o libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log
-COPY libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll
+COPY libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll >> %STARTINGDIR%\environment-setup.log
+ECHO.
 ECHO ------------------------------------------
 ECHO Installing driver. Accept prompt.
 ECHO ------------------------------------------
+ECHO.
 IF EXIST "%WinDir%\System32\PnPUtil.exe" (%WinDir%\System32\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)
 IF EXIST "%WinDir%\Sysnative\PnPUtil.exe" (%WinDir%\Sysnative\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)

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


diff --git a/util/2-setup-environment-win.bat b/util/2-setup-environment-win.bat index 905338087..3e54cc776 100644 --- a/util/2-setup-environment-win.bat +++ b/util/2-setup-environment-win.bat
@@ -1,46 +1,55 @@
1	@SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION	1	@SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
2	@ECHO OFF	2	@ECHO OFF
3		3
		4	CD %~dp0
		5
4	SET STARTINGDIR=%CD%	6	SET STARTINGDIR=%CD%
		7	echo %STARTINGDIR%
5		8
6	:: Check for admin privilages	9	:: Check for admin privilages
7	SETX /M test test > nul 2>&1	10	SETX /M test test > nul 2>&1
8	IF NOT ["%ERRORLEVEL%"]==["0"] (	11	IF NOT ["%ERRORLEVEL%"]==["0"] (
9	ECHO FAILED. Rerun with administrator privileges.	12	ELEVATE -wait 2-setup-environment-win.bat & goto :EOF
10	GOTO ExitBatch
11	)	13	)
12		14
		15	DEL %STARTINGDIR%\environment-setup.log
		16
13	:: Make sure path to MinGW exists - if so, CD to it	17	:: Make sure path to MinGW exists - if so, CD to it
14	SET MINGWPATH="C:\MinGW\bin"	18	SET MINGWPATH="C:\MinGW\bin"
15	IF NOT EXIST !MINGWPATH! (ECHO Path not found: %MINGWPATH% && GOTO ExitBatch)	19	IF NOT EXIST !MINGWPATH! (ECHO Path not found: %MINGWPATH%. Did you install MinGW to the default location? && GOTO ExitBatch)
16	CD /D %MINGWPATH%	20	CD /D %MINGWPATH%
17		21
18		22	ECHO.
19	ECHO ------------------------------------------	23	ECHO ------------------------------------------
20	ECHO Installing wget and unzip	24	ECHO Installing wget and unzip
21	ECHO ------------------------------------------	25	ECHO ------------------------------------------
22	mingw-get install msys-wget-bin msys-unzip-bin	26	ECHO.
		27	mingw-get install msys-wget-bin msys-unzip-bin
23		28
24	MKDIR temp	29	MKDIR temp
25	CD temp	30	CD temp
26		31
		32	ECHO.
27	ECHO ------------------------------------------	33	ECHO ------------------------------------------
28	ECHO Installing dfu-programmer.	34	ECHO Installing dfu-programmer.
29	ECHO ------------------------------------------	35	ECHO ------------------------------------------
30	wget http://iweb.dl.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip	36	ECHO.
31	unzip dfu-programmer-win-0.7.2.zip	37	wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip' >> %STARTINGDIR%\environment-setup.log
32	COPY dfu-programmer.exe ..	38	unzip -o dfu-programmer-win-0.7.2.zip >> %STARTINGDIR%\environment-setup.log
		39	COPY dfu-programmer.exe .. >> %STARTINGDIR%\environment-setup.log
33		40
34	ECHO ------------------------------------------	41	ECHO ------------------------------------------
35	ECHO Downloading driver	42	ECHO Downloading driver
36	ECHO ------------------------------------------	43	ECHO ------------------------------------------
37	wget http://iweb.dl.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip	44	wget http://downloads.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log
38	unzip libusb-win32-bin-1.2.6.0.zip	45	unzip -o libusb-win32-bin-1.2.6.0.zip >> %STARTINGDIR%\environment-setup.log
39	COPY libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll	46	COPY libusb-win32-bin-1.2.6.0\bin\x86\libusb0_x86.dll ../libusb0.dll >> %STARTINGDIR%\environment-setup.log
40		47
		48	ECHO.
41	ECHO ------------------------------------------	49	ECHO ------------------------------------------
42	ECHO Installing driver. Accept prompt.	50	ECHO Installing driver. Accept prompt.
43	ECHO ------------------------------------------	51	ECHO ------------------------------------------
		52	ECHO.
44	IF EXIST "%WinDir%\System32\PnPUtil.exe" (%WinDir%\System32\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)	53	IF EXIST "%WinDir%\System32\PnPUtil.exe" (%WinDir%\System32\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)
45	IF EXIST "%WinDir%\Sysnative\PnPUtil.exe" (%WinDir%\Sysnative\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)	54	IF EXIST "%WinDir%\Sysnative\PnPUtil.exe" (%WinDir%\Sysnative\PnPUtil.exe -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf && GOTO PNPUTILFOUND)
46		55