From 913ff7a3da469b07f675bc947d2c48db4c5c33b6 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Thu, 5 Sep 2013 19:21:39 +0000 Subject: - Installer: Fix for interactive mode git-svn-id: http://svn.miranda-ng.org/main/trunk@5957 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- tools/installer_ng/make.bat | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat index e71077ccb3..84eae08304 100644 --- a/tools/installer_ng/make.bat +++ b/tools/installer_ng/make.bat @@ -10,12 +10,13 @@ rem end rem Get archives if needed echo ------------------------------------------------------------------------------------ echo ------------------------------------------------------------------------------------ -echo ------------------------------------------------------------------------------------ -echo ------------------------------------------------------------------------------------ -echo ------------------------------------------------------------------------------------ +:again set /p answer=Do you want to create folder structure and download new components? (Y/N): -if %answer% == y goto download -if %answer% == yes goto download +if /i "%answer:~,1%" EQU "Y" goto download +if /i "%answer:~,1%" EQU "N" goto chk32 +echo Please type Y for Yes or N for No +goto again +:chk32 if not exist InnoNG_32 (goto error) else (goto chk64) :chk64 if not exist InnoNG_64 (goto error) else (goto continue) @@ -40,15 +41,14 @@ if defined ProgramFiles(x86) ( rem end rem Cleanup -echo ------------------------------------------------------------------------- -echo ------------------------------------------------------------------------- -echo ------------------------------------------------------------------------- -echo ------------------------------------------------------------------------- -echo ------------------------------------------------------------------------- -set /p answer=Do you wish to delete temp files and build folders? (Y/N): -if %answer% == y goto cleanup -if %answer% == yes goto cleanup -goto end +echo ------------------------------------------------------------------------------------ +echo ------------------------------------------------------------------------------------ +:again1 +set /p ans=Do you wish to delete temp files and build folders? (Y/N): +if /i "%ans:~,1%" EQU "Y" goto cleanup +if /i "%ans:~,1%" EQU "N" goto end +echo Please type Y for Yes or N for No +goto again1 :cleanup echo Running cleanup! call cleanup.bat -- cgit v1.2.3