Ensured Windows script fail on non-supported Python #48

aboutcode-org · Nov 24, 2015 · a33a5f5 · a33a5f5
1 parent 804dd42
commit a33a5f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/configure.bat b/configure.bat
@@ -50,10 +50,13 @@ if not exist "c:\python27\python.exe" (
     echo(
     echo    https://www.python.org/ftp/python/2.7.10/python-2.7.10.msi
     echo(
-    goto EOS
+    exit /b 1
 )
 
 call c:\python27\python.exe etc/configure.py %SCANCODE_CLI_ARGS%
+if %errorlevel% neq 0 (
+    exit /b %errorlevel%
+)
 if exist bin\activate (
     bin\activate
 )

diff --git a/etc/conf/base.py b/etc/conf/base.py
@@ -9,7 +9,7 @@
 def unsupported():
     print('Unsupported OS/platform.')
     print('See https://github.com/nexB/scancode-toolkit/ for supported OS/platforms.')
-    print('Enter a ticket https://github.com/nexB/scancode-toolkit/issues asking for your OS/platform combo.')
+    print('Enter a ticket https://github.com/nexB/scancode-toolkit/issues asking for support of your OS/platform combo.')
     sys.exit(1)
 
 if sys.maxsize > 2 ** 32:

diff --git a/extractcode.bat b/extractcode.bat
@@ -28,6 +28,9 @@ goto scancode
  echo * Configuring ScanCode ...
  set CONFIGURE_QUIET=1
  call %SCANCODE_ROOT_DIR%\configure etc/conf
+ if %errorlevel% neq 0 (
+    exit /b %errorlevel%
+ )
 
 :scancode
 %SCANCODE_ROOT_DIR%\bin\extractcode %SCANCODE_CMD_LINE_ARGS%

diff --git a/scancode.bat b/scancode.bat
@@ -28,6 +28,9 @@ goto scancode
  echo * Configuring ScanCode ...
  set CONFIGURE_QUIET=1
  call %SCANCODE_ROOT_DIR%\configure etc/conf
+ if %errorlevel% neq 0 (
+    exit /b %errorlevel%
+ )
 
 :scancode
 %SCANCODE_ROOT_DIR%\bin\scancode %SCANCODE_CMD_LINE_ARGS%