From cd9f6480ecf257c78d38b1414954d648ebcdac2c Mon Sep 17 00:00:00 2001
From: Noiredd <snowball91b@gmail.com>
Date: Sat, 2 Mar 2019 23:37:46 +0100
Subject: [PATCH] dependency checker moved to tools, launchers updated

Small tweak in the Windows launcher: that ELSE clause was absolutely useless.
---
 Filmatyk.bat                                    | 7 +------
 Filmatyk_linux.sh                               | 2 +-
 filmatyk/dependency_test.py => tools/deptest.py | 0
 tools/pytest.py                                 | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)
 rename filmatyk/dependency_test.py => tools/deptest.py (100%)

diff --git a/Filmatyk.bat b/Filmatyk.bat
index 317b752..baf5891 100644
--- a/Filmatyk.bat
+++ b/Filmatyk.bat
@@ -43,11 +43,6 @@ REM Iterate over versions
       SET pyexe=%%p
       GOTO exit_loop
     )
-  ) ELSE (
-    REM Executable not found - might need to set status too
-    IF 3 LSS %python_status% (
-      SET python_status=3
-    )
   )
 ))
 :exit_loop
@@ -57,7 +52,7 @@ IF %python_status% NEQ 0 (
 )
 
 REM Check dependencies
-%pyexe% filmatyk\dependency_test.py
+%pyexe% tools\deptest.py
 REM If it left a list of packages to install - pass it to pip
 IF EXIST install.txt (
   REM Tester can leave a list of missing packages. In this case - install them,
diff --git a/Filmatyk_linux.sh b/Filmatyk_linux.sh
index f46fa54..b7366ca 100644
--- a/Filmatyk_linux.sh
+++ b/Filmatyk_linux.sh
@@ -31,7 +31,7 @@ else
 fi
 
 # Check dependencies
-$pycmd filmatyk/dependency_test.py
+$pycmd tools/deptest.py
 if [ -f install.txt ]; then
   $pycmd -m pip install -r install.txt
   rm install.txt
diff --git a/filmatyk/dependency_test.py b/tools/deptest.py
similarity index 100%
rename from filmatyk/dependency_test.py
rename to tools/deptest.py
diff --git a/tools/pytest.py b/tools/pytest.py
index 2f2a1cf..b6a9f71 100644
--- a/tools/pytest.py
+++ b/tools/pytest.py
@@ -1,5 +1,4 @@
 import sys
-#print(sys.argv)
 if sys.version_info.major != 3:
   sys.exit(2)
 if sys.version_info.minor < 6: