[ros-diffs] [dreimer] 37389: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. Fixed sSVN.ps1. Works now. Left TODO: reladdr2line

Author: dreimer
Date: Sun Nov 16 08:46:40 2008
New Revision: 37389

URL: http://svn.reactos.org/svn/reactos?rev=37389&view=rev
Log:
Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting.
Fixed sSVN.ps1. Works now. Left TODO: reladdr2line

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

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun Nov 16 08:46:40 2008
@@ -8,8 +8,8 @@
 #

function UP {
-    "Local Revision: $OFFSVN"
-    "Online HEAD Revision: $ONSVN"
+    "Local $OFFSVN"
+    "Online HEAD $ONSVN"
     ""
     if ($OFFSVN -lt $ONSVN) {
         "Your tree is not up to date. Do you want to update it?"
@@ -76,8 +76,8 @@
     $host.ui.RawUI.WindowTitle = "SVN Status"
     "This might take a while, so please be patient."
     ""
-    $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:"
-    $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:"
+    $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | findstr "Revision:"
+    $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | findstr "Revision:"
     UP
 }

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Conf...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Sun Nov 16 08:46:40 2008
@@ -136,7 +136,7 @@
 echo Right now: %OARCH%
 set /p OARCH_CH=
 if "%OARCH_CH%" == "" (
-    set OARCH_CH=pentium
+    set OARCH_CH=%OARCH%
 )
 cls

@@ -152,7 +152,7 @@
 echo Right now: %OPTIMIZE%
 set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)"
 if "%OPTIMIZE_CH%" == "" (
-    set OPTIMIZE_CH=1
+    set OPTIMIZE_CH=%OPTIMIZE%
 )
 cls

@@ -164,7 +164,7 @@
 echo Right now: %KDBG%
 set /p KDBG_CH="(0), (1)"
 if "%KDBG_CH%" == "" (
-    set KDBG_CH=1
+    set KDBG_CH=%KDBG%
 )
 cls

@@ -177,7 +177,7 @@
 echo Right now: %DBG%
 set /p DBG_CH="(0), (1)"
 if "%DBG_CH%" == "" (
-    set DBG_CH=1
+    set DBG_CH=%DBG%
 )
 cls

@@ -190,7 +190,7 @@
 echo Right now: %GDB%
 set /p GDB_CH="(0), (1)"
 if "%GDB_CH%" == "" (
-    set GDB_CH=0
+    set GDB_CH=%GDB%
 )
 cls

@@ -205,7 +205,7 @@
 echo Right now: %NSWPAT%
 set /p NSWPAT_CH="(0), (1)"
 if "%NSWPAT_CH%" == "" (
-    set NSWPAT_CH=0
+    set NSWPAT_CH=%NSWPAT%
 )
 cls

@@ -222,7 +222,7 @@
 echo Right now: %WINKD%
 set /p WINKD_CH="(0), (1)"
 if "%WINKD_CH%" == "" (
-    set WINKD_CH=0
+    set WINKD_CH=%WINKD%
 )
 cls