[ros-diffs] [dreimer] 29801: Added more Error Messages to prevent confusion and stupid mistakes. Edited some Errors.

Author: dreimer
Date: Tue Oct 23 01:59:49 2007
New Revision: 29801

URL: http://svn.reactos.org/svn/reactos?rev=29801&view=rev
Log:
Added more Error Messages to prevent confusion and stupid mistakes.
Edited some Errors.

Modified:
    trunk/tools/RosBE-Windows/Root/chdefdir.cmd
    trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
    trunk/tools/RosBE-Windows/Root/scut.cmd

Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Tue Oct 23 01:59:49 2007
@@ -25,7 +25,7 @@
     set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR%
 ) else (
     if not exist "%1\." (
-        echo The path specified doesn't seem to exist.
+        echo ERROR: The path specified doesn't seem to exist.
         goto :EOC
     )
     set _ROSBE_ROSSOURCEDIR=%1
@@ -36,14 +36,14 @@
 set /p XY="Please enter a ReactOS source directory, or 'previous': "
 
 if /i "%XY%" == "" (
-    echo You must either enter a directory or "previous".
+    echo ERROR: You must either enter a valid directory or "previous".
     goto :EOC
 )
 if /i "%XY%"=="previous" (
     set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR%
 ) else (
     if not exist "%XY%\." (
-        echo The path specified doesn't seem to exist.
+        echo ERROR: The path specified doesn't seem to exist.
         goto :EOC
     )
     set _ROSBE_ROSSOURCEDIR=%XY%

Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Tue Oct 23 01:59:49 2007
@@ -37,6 +37,18 @@
 set /p _2="Please enter the address you would like to analyze: "
 
 :EOC
+if not exist "%_1%\." (
+    echo ERROR: The path specified doesn't seem to exist.
+    goto :END
+)
+if /i "%_1%" == "" (
+    echo ERROR: You must enter a valid directory.
+    goto :END
+)
+if /i "%_2%" == "" (
+    echo ERROR: You must enter a address to analyze.
+    goto :END
+)
 ::
 :: First get the ImageBase of the File. If its smaller than the given
 :: Parameter, everything is ok, because it was already added onto the
@@ -52,4 +64,5 @@
     raddr2line "%_1%" "%relbase%" 2>NUL
 )
 
+:END
 title ReactOS Build Environment %_ROSBE_VERSION%

Modified: trunk/tools/RosBE-Windows/Root/scut.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/scut.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/scut.cmd Tue Oct 23 01:59:49 2007
@@ -53,6 +53,14 @@
 ::
 :DEF
 set /p XY="Choose your Source Folder: "
+if not exist "%XY%\." (
+    echo ERROR: The path specified doesn't seem to exist.
+    goto :END
+)
+if /i "%XY%" == "" (
+    echo ERROR: You must enter a valid directory.
+    goto :END
+)
 :RUN
 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type
"%_ROSBE_BASEDIR%\srclist.txt"`) do (
     if %%i == %XY% (
@@ -82,8 +90,20 @@
 
 :ADD1
 set /p CUT="Choose your Shortcut: "
+if /i "%CUT%" == "" (
+    echo ERROR: You must enter a valid Shortcut.
+    goto :END
+)
 :ADD2
 set /p DIR="Choose your Source Folder: "
+if not exist "%DIR%\." (
+    echo ERROR: The path specified doesn't seem to exist.
+    goto :END
+)
+if /i "%DIR%" == "" (
+    echo ERROR: You must enter a valid directory.
+    goto :END
+)
 :ADD23
 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type
"%_ROSBE_BASEDIR%\srclist.txt"`) do (
     if %%i == %CUT% (
@@ -105,6 +125,10 @@
     goto :REM1
 )
 set /p CUTREM="Choose your Shortcut: "
+if /i "%CUTREM%" == "" (
+    echo ERROR: You must enter a valid Shortcut.
+    goto :END
+)
 :REM1
 set _ROSBE_REM=0
 for /f "usebackq tokens=1-2 delims=," %%i in (`type
"%_ROSBE_BASEDIR%\srclist.txt"`) do (
@@ -133,6 +157,10 @@
     goto :DEF1
 )
 set /p DIR="Choose your new Default Shortcut: "
+if /i "%DIR%" == "" (
+    echo ERROR: You must enter a valid Shortcut.
+    goto :END
+)
 :DEF1
 call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR%
 
@@ -155,8 +183,20 @@
 
 :EDIT1
 set /p CUT="Choose your Shortcut: "
+if /i "%CUT%" == "" (
+    echo ERROR: You must enter a valid Shortcut.
+    goto :END
+)
 :EDIT2
 set /p DIR="Choose your Source Folder: "
+if not exist "%DIR%\." (
+    echo ERROR: The path specified doesn't seem to exist.
+    goto :END
+)
+if /i "%DIR%" == "" (
+    echo ERROR: You must enter a valid directory.
+    goto :END
+)
 :EDIT23
 set _ROSBE_EDIT=0
 for /f "usebackq tokens=1-2 delims=," %%i in (`type
"%_ROSBE_BASEDIR%\srclist.txt"`) do (