[ros-diffs] [dreimer] 39213: Accept "y" and "yes" when it asks for a decision from now on. (GOD, Batch is soo ugly)

Author: dreimer
Date: Fri Jan 30 09:19:19 2009
New Revision: 39213

URL: http://svn.reactos.org/svn/reactos?rev=39213&view=rev
Log:
Accept "y" and "yes" when it asks for a decision from now on. (GOD,
Batch is soo ugly)

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/update.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Fri Jan 30 09:19:19
2009
@@ -23,7 +23,7 @@
     "config.rbuild will be permanently deleted. All your settings will be
gone."
     "Continue?"
     $YESNO = Read-Host "(yes), (no)"
-    if ($YESNO -eq "yes") {
+    if (($YESNO -eq "yes") -or ($YESNO -eq "y")) {
         if (Test-Path ".\config.rbuild") {
             remove-item ".\config.rbuild"
             "Main Configuration File was found and deleted."
@@ -44,7 +44,7 @@
     "default one. You will need to reconfigure it to your wishes later."
     "Continue?"
     $YESNO = Read-Host "(yes), (no)"
-    if ($YESNO -eq "yes") {
+    if (($YESNO -eq "yes") -or ($YESNO -eq "y")) {
         remove-item "$_ROSBE_BASEDIR\*.rbuild"
         remove-item ".\config.rbuild"
         copy-item ".\config.template.rbuild"
"$ENV:APPDATA\RosBE\config.rbuild"
@@ -75,7 +75,7 @@
 ""
 
 $YESNO = Read-Host "(yes), (no)"
-if ($YESNO -ne "yes") {settitle}
+if (($YESNO -ne "yes") -and ($YESNO -ne "y")) {settitle}
 
 #
 # Check if config.template.rbuild is newer than config.rbuild, if it is then
@@ -90,7 +90,7 @@
         "*** previously made settings.                                  ***"
         ""
         $YESNO = Read-Host "(yes), (no)"
-        if ($YESNO -eq "yes") {remove-item
"$ENV:APPDATA\RosBE\*.rbuild" | remove-item ".\config.rbuild" |
copy-item ".\config.template.rbuild"
"$ENV:APPDATA\RosBE\config.rbuild"}
+        if (($YESNO -eq "yes") -or ($YESNO -eq "y")) {remove-item
"$ENV:APPDATA\RosBE\*.rbuild" | remove-item ".\config.rbuild" |
copy-item ".\config.template.rbuild"
"$ENV:APPDATA\RosBE\config.rbuild"}
         else {settitle}
     }
 }

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Fri Jan 30 09:19:19
2009
@@ -14,7 +14,7 @@
     if ($OFFSVN -lt $ONSVN) {
         "Your tree is not up to date. Do you want to update it?"
         $UP = Read-Host "Please enter 'yes' or 'no': "
-        if ($UP -eq "yes") {
+        if (($UP -eq "yes") -or ($UP -eq "y")) {
             IEX "&'$_ROSBE_BASEDIR\ssvn' update"
         }
     }

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Fri Jan 30 09:19:19
2009
@@ -34,7 +34,7 @@
         ""
         "Install?"
         $YESNO = Read-Host "(yes), (no)"
-        if ($YESNO -eq "yes") {
+        if (($YESNO -eq "yes") -or ($YESNO -eq "y")) {
             if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) {
                 get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt
$PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt
             }
@@ -51,7 +51,7 @@
         } elseif ($YESNO -eq "no") {
             "Do you want to be asked again to install this update?"
             $YESNO = Read-Host "(yes), (no)"
-            if ($YESNO -eq "yes") {
+            if (($YESNO -eq "yes") -or ($YESNO -eq "y")) {
                 remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" -force -EA
SilentlyContinue
             }
             return

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Fri Jan 30 09:19:19 2009
@@ -24,6 +24,7 @@
     echo Continue?
     set /p YESNO="(yes), (no)"
     if /i "!YESNO!"=="yes" goto :CONT
+    if /i "!YESNO!"=="y" goto :CONT
     goto :NOK
 
     :CONT
@@ -47,6 +48,7 @@
     echo Continue?
     set /p YESNO="(yes), (no)"
     if /i "!YESNO!"=="yes" goto :CONT2
+    if /i "!YESNO!"=="y" goto :CONT2
     goto :NOK
 
     :CONT2
@@ -80,6 +82,7 @@
 
 set /p YESNO="(yes), (no)"
 if /i "%YESNO%"=="yes" goto :OK
+if /i "%YESNO%"=="y" goto :OK
 goto :NOK
 
 :OK
@@ -98,9 +101,15 @@
         echo *** previously made settings.                                  ***
         echo.
         set /p YESNO="(yes), (no)"
-        if /i "!YESNO!"=="yes" del
"%APPDATA%\RosBE\*.rbuild" | del "config.rbuild" | copy
"config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" | goto :OK
+        if /i "!YESNO!"=="yes" goto :YES
+        if /i "!YESNO!"=="y" goto :YES
+        goto :NOK
+        :YES
+        del "%APPDATA%\RosBE\*.rbuild"
+        del "config.rbuild"
+        copy "config.template.rbuild"
"%APPDATA%\RosBE\config.rbuild"
+        goto :OK
         endlocal
-        goto :NOK
     )
 )
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Fri Jan 30 09:19:19 2009
@@ -97,7 +97,8 @@
 
 set /p UP="Please enter 'yes' or 'no': "
 if /i "%UP%"=="yes" "%_ROSBE_BASEDIR%\ssvn" update
-if /i "%UP%"=="no" goto :EOF
+if /i "%UP%"=="y" "%_ROSBE_BASEDIR%\ssvn" update
+goto :EOF
 
 :EOC
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Fri Jan 30 09:19:19 2009
@@ -185,7 +185,10 @@
     echo Install?
     setlocal enabledelayedexpansion
     set /p YESNO="(yes), (no)"
-    if /i "!YESNO!"=="yes" (
+    if /i "!YESNO!"=="yes" goto :updyes
+    if /i "!YESNO!"=="y" goto :updyes
+    goto :no
+    :updyes
         if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" (
             "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z 1> NUL 2> NUL
         )
@@ -199,12 +202,15 @@
             echo ERROR: This Update does not seem to exist or the Internet connection is
not working correctly.
             goto :EOF
         )
-    ) else if /i "!YESNO!"=="no" (
+        goto :EOF
+    :no
         echo Do you want to be asked again to install this update?
         set /p YESNO="(yes), (no)"
-        if /i "!YESNO!"=="yes" (
-            del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL
-        )
+        if /i "!YESNO!"=="yes" goto :yesagain
+        if /i "!YESNO!"=="y" goto :yesagain
+        goto :EOF
+        :yesagain
+        del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL
         goto :EOF
     )
     endlocal