From c12be71d11b2faa7d161d7a6acb84736bb22dbb2 Mon Sep 17 00:00:00 2001 From: IBNobody Date: Fri, 1 Apr 2016 00:10:21 -0500 Subject: [PATCH 1/2] Added Error Checking to Setup.bat #2 Added check for the MinGW directory. Fixed a bug with script exiting out of a CMD window. Fixed a bug with script dropping user into MinGW directory. Fixed a bug with RD not deleting temp. Fixed a bug with PNPUtil.exe not being present in the path. --- 2-setup-environment-win.bat | 82 +++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/2-setup-environment-win.bat b/2-setup-environment-win.bat index 91b6c91e39..2b06168c7c 100644 --- a/2-setup-environment-win.bat +++ b/2-setup-environment-win.bat @@ -1,41 +1,63 @@ -@echo off -setx /M test test > nul 2>&1 -if NOT ["%errorlevel%"]==["0"] ( - echo FAILED. Rerun with administrator privileges. - pause - exit +@SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION +@ECHO OFF + +SET STARTINGDIR=%CD% + +:: Check for admin privilages +SETX /M test test > nul 2>&1 +IF NOT ["%ERRORLEVEL%"]==["0"] ( + ECHO FAILED. Rerun with administrator privileges. + GOTO ExitBatch ) -echo ------------------------------------------ -echo Installing wget and unzip -echo ------------------------------------------ -mingw-get install msys-wget-bin msys-unzip-bin -cd \MinGW\bin +:: 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) +cd %MINGWPATH% -mkdir temp -cd temp -echo ------------------------------------------ -echo Installing dfu-programmer. -echo ------------------------------------------ + +ECHO ------------------------------------------ +ECHO Installing wget and unzip +ECHO ------------------------------------------ +mingw-get install msys-wget-bin msys-unzip-bin + +MKDIR temp +CD temp + +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 unzip dfu-programmer-win-0.7.2.zip -copy dfu-programmer.exe .. +COPY dfu-programmer.exe .. -echo ------------------------------------------ -echo Downloading driver -echo ------------------------------------------ +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 unzip libusb-win32-bin-1.2.6.0.zip -cp 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 -echo ------------------------------------------ -echo Installing driver. Accept prompt. -echo ------------------------------------------ -pnputil -i -a dfu-prog-usb-1.2.2\atmel_usb_dfu.inf +ECHO ------------------------------------------ +ECHO Installing driver. Accept prompt. +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) -cd .. -rm -rf temp +ECHO FAILED. Could not find PnPUtil.exe in "%WinDir%\System32" or "%WinDir%\Sysnative". -echo ------------------------------------------ -echo Finished! -pause \ No newline at end of file +:PNPUTILFOUND + +:: Wait then delete directory +ping -n 5 127.0.0.1 > NUL 2>&1 +CD .. +RD /s /q temp + +ECHO ------------------------------------------ +ECHO Finished! + +:ExitBatch +CD %STARTINGDIR% +ENDLOCAL +PAUSE +EXIT /b \ No newline at end of file From e4d2b90bda5d654a2d3053897c18e9e03a6b4379 Mon Sep 17 00:00:00 2001 From: IBNobody Date: Mon, 11 Apr 2016 13:20:22 -0500 Subject: [PATCH 2/2] Fixed CD --- 2-setup-environment-win.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2-setup-environment-win.bat b/2-setup-environment-win.bat index 2b06168c7c..905338087a 100644 --- a/2-setup-environment-win.bat +++ b/2-setup-environment-win.bat @@ -13,7 +13,7 @@ IF NOT ["%ERRORLEVEL%"]==["0"] ( :: 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) -cd %MINGWPATH% +CD /D %MINGWPATH% ECHO ------------------------------------------ @@ -57,7 +57,7 @@ ECHO ------------------------------------------ ECHO Finished! :ExitBatch -CD %STARTINGDIR% +CD /D %STARTINGDIR% ENDLOCAL PAUSE EXIT /b \ No newline at end of file