[ros-diffs] [dreimer] 41953: Made the updater Useable again with Colin's Spring Cleanup. Fixed a typo in the PS Version First Update for RosBE64 1.1 Support is available now.

Author: dreimer
Date: Tue Jul 14 19:05:03 2009
New Revision: 41953

URL: http://svn.reactos.org/svn/reactos?rev=41953&view=rev
Log:
Made the updater Useable again with Colin's Spring Cleanup.
Fixed a typo in the PS Version
First Update for RosBE64 1.1 Support is available now.

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

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] Tue Jul 14 19:05:03
2009
@@ -20,8 +20,7 @@
 
     if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") {
         return
-    }
-    if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) {
+    } else {
         get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt
$PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt
     }
     if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") {
@@ -31,7 +30,7 @@
         $YESNO = Read-Host "(yes), (no)"
         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
+                get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z
$PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z
             }
             if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") {
                 remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA
SilentlyContinue

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] Tue Jul 14 19:05:03 2009
@@ -57,15 +57,15 @@
     call :UPDCHECK
 ) else if /i "%1" == "delete" (
     set _ROSBE_STATCOUNT=%2
-    del /F /Q "%APPDATA%\RosBE\Updates\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*"
1> NUL 2> NUL
-    del /F /Q
"%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.*" 1> NUL
2> NUL
+    del /F /Q "%APPDATA%\RosBE\Updates\%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.*"
1> NUL 2> NUL
+    del /F /Q
"%APPDATA%\RosBE\Updates\tmp\%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.*" 1> NUL
2> NUL
 ) else if /i "%1" == "info" (
     set _ROSBE_STATCOUNT=%2
     cd tmp
-    if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
-        "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL
-        if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
-            type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt"
+    if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
+        "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
+        if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
+            type "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt"
         ) else (
             echo ERROR: This Update does not seem to exist or the Internet connection is
not working correctly.
             goto :EOC
@@ -92,16 +92,16 @@
 :UPDCHECK
 cd /d "%APPDATA%\RosBE\Updates"
 
-if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
+if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
     goto :EOF
 )
 
-if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
-    "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL
+if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
+    "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
 )
 
-if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
-    type "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt"
+if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
+    type "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt"
     echo.
     echo Install?
     set /p YESNO="(yes), (no)"
@@ -109,14 +109,14 @@
     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
+        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
         )
-        if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z" (
-            del /F /Q "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%\*.*" 1>NUL
2>NUL
-            "%_ROSBE_BASEDIR%\Tools\7z.exe" x
"%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.7z"
-            cd "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%"
-            call "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.cmd"
+        if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z" (
+            del /F /Q "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!\*.*" 1>NUL
2>NUL
+            "%_ROSBE_BASEDIR%\Tools\7z.exe" x
"%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.7z"
+            cd "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!"
+            call "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.cmd"
             goto :EOF
         ) else (
             echo ERROR: This Update does not seem to exist or the Internet connection is
not working correctly.
@@ -130,7 +130,7 @@
         if /i "!YESNO!"=="y" goto :yesagain
         goto :EOF
         :yesagain
-        del "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" 1> NUL 2> NUL
+        del "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" 1> NUL 2> NUL
         goto :EOF
     )
 ) else (
@@ -150,18 +150,18 @@
 :WHILE2
     if "!_ROSBE_STATCOUNT!" == "10" GOTO :OUT
     cd tmp
-    if not exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
-        "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt 1> NUL 2> NUL
-        if exist "%_ROSBE_VERSION%-%_ROSBE_STATCOUNT%.txt" (
-            set _ROSBE_UPDATES=%_ROSBE_UPDATES% %_ROSBE_STATCOUNT% 
+    if not exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
+        "%_ROSBE_BASEDIR%\Tools\wget.exe" -N --ignore-length --no-verbose
%_ROSBE_URL%/%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt 1> NUL 2> NUL
+        if exist "%_ROSBE_VERSION%-!_ROSBE_STATCOUNT!.txt" (
+            set _ROSBE_UPDATES=!_ROSBE_UPDATES! !_ROSBE_STATCOUNT!
         )
     )
     cd..
     set /a _ROSBE_STATCOUNT+=1
     GOTO :WHILE2
-:OUT
 
 :EOC
 cd /d "%_ROSBE_OPATH%"
 title ReactOS Build Environment %_ROSBE_VERSION%
-endlocal
+:OUT
+endlocal & set _ROSBE_UPDATES=%_ROSBE_UPDATES% & set
_ROSBE_STATCOUNT=%_ROSBE_STATCOUNT%