Update travis

MISP · Feb 13, 2017 · dae20c6 · dae20c6
1 parent 05cd860
commit dae20c6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,14 +9,8 @@ sudo: required
 
 install:
     - sudo apt-get update -qq
-    - sudo apt-get install -y -qq jq
+    - sudo apt-get install -y -qq jq moreutils
     - pip install jsonschema
 
 script:
-    - |
-      for dir in lists/*/list.json
-      do
-        echo -n "${dir}: "
-        jsonschema -i ${dir} schema.json
-        echo ''
-      done
+    - ./validate_all.sh
diff --git a/validate_all.sh b/validate_all.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+set -x
+
+./jq_all_the_things.sh
+
+diffs=`git status --porcelain | wc -l`
+
+if ! [ $diffs -eq 0 ]; then
+	echo "Please make sure you run ./jq_all_the_things.sh before commiting."
+	exit 1
+fi
+
+for dir in lists/*/list.json
+do
+  echo -n "${dir}: "
+  jsonschema -i ${dir} schema.json
+  echo ''
+done
+