Move trivial-validate.py to utils/

pde · pde · commit 69b8669bf457 · 2012-05-10T16:35:39.000-07:00
diff --git a/makecrx.sh b/makecrx.sh
@@ -36,11 +36,15 @@ VERSION=`python -c "import json ; print json.loads(open('chromium/manifest.json'
 
 echo "Building chrome version" $VERSION
 
-if [ -x trivial-validate.py ]; then
-	VALIDATE="./trivial-validate.py --ignoredups google --ignoredups facebook"
+if [ -f utils/trivial-validate.py ]; then
+	VALIDATE="python utils/trivial-validate.py --ignoredups google --ignoredups facebook"
+elif [ -x utils/trivial-validate ] ; then
+  # This case probably never happens
+	VALIDATE=./utils/trivial-validate
 else
 	VALIDATE=./trivial-validate
 fi
+
 if $VALIDATE src/chrome/content/rules >&2
 then
   echo Validation of included rulesets completed. >&2
diff --git a/makexpi.sh b/makexpi.sh
@@ -26,11 +26,15 @@ if [ -n "$1" ]; then
 	git reset --hard "$1"
 fi
 
-if [ -x trivial-validate.py ]; then
-	VALIDATE="python trivial-validate.py --ignoredups google --ignoredups facebook"
+if [ -f utils/trivial-validate.py ]; then
+	VALIDATE="python utils/trivial-validate.py --ignoredups google --ignoredups facebook"
+elif [ -x utils/trivial-validate ] ; then
+  # This case probably never happens
+	VALIDATE=./utils/trivial-validate
 else
-	VALIDATE="python trivial-validate"
+	VALIDATE=./trivial-validate
 fi
+
 if $VALIDATE src/chrome/content/rules >&2
 then
   echo Validation of included rulesets completed. >&2
diff --git a/utils/trivial-validate.py b/utils/trivial-validate.py
