Changeset 2541 for trunk/eraser

Timestamp:

3/17/2012 12:55:49 PM (14 months ago)

Author:

lowjoel

Message:

Handle no-TortoiseSVN situations differently from SubWCRev returning an error.

File:

• trunk/eraser/UpdateVersions.bat (modified) (2 diffs)

trunk/eraser/UpdateVersions.bat

@@ -5 +5 @@
 "%ProgramFiles%\TortoiseSVN\bin\SubWCRev.exe" %1 %2 %3 -f
 if ERRORLEVEL 1 (
-    goto noSubWCRev
+    exit /b %ERRORLEVEL%
 )
 goto end
@@ -11 +11 @@
 :searchWoWProgramFiles
 
-"%ProgramW6432%\TortoiseSVN\bin\SubWCRev.exe" %1 %2 %3 -f
+if not exist "%ProgramFiles(x86)%\TortoiseSVN\bin\SubWCRev.exe" goto searchPath
+"%ProgramFiles(x86)%\TortoiseSVN\bin\SubWCRev.exe" %1 %2 %3 -f
 if ERRORLEVEL 1 (
-    goto noSubWCRev
+    exit /b %ERRORLEVEL%
+)
+goto end
+
+:searchPath
+
+for %i in (SubWCRev.exe) do (
+    if exist "%~$PATH:i" (
+        "SubWCRev.exe" %1 %2 %3 -f
+    ) else (
+        goto noSubWCRev
+    )
+)
+if ERRORLEVEL 1 (
+    exit /b %ERRORLEVEL%
 )