Allow running from root directory as well as from inside the tools di…

…rectory
acemod · Mar 30, 2019 · c9e9bf7 · jonpas · Mar 31, 2019 · c9e9bf7
1 parent df3daf4
commit c9e9bf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/circle.yml b/circle.yml
@@ -7,7 +7,7 @@ jobs:
       - checkout
       - run:
           name: Validate SQF and Config style and Stringtable entries
-          command: python tools/check_strings.py && python tools/sqf_validator.py && python tools/config_style_checker.py
+          command: python tools/sqf_validator.py && python tools/config_style_checker.py && python tools/check_strings.py
 
   linting:
     docker:

diff --git a/tools/check_strings.py b/tools/check_strings.py
@@ -51,7 +51,12 @@ def main(argv):
     allDefinedStrings = []
     allUsedStrings = []
 
-    for root, dirnames, filenames in os.walk('../addons' + '/'):
+    # Allow running from root directory as well as from inside the tools directory
+    rootDir = "../addons"
+    if (os.path.exists("addons")):
+        rootDir = "addons"
+
+    for root, dirnames, filenames in os.walk(rootDir):
       for filename in fnmatch.filter(filenames, '*.sqf'):
         sqf_list.append(os.path.join(root, filename))
       for filename in fnmatch.filter(filenames, '*.cpp'):