Fix: Rename tox job and remove pre-commit

[releng/global-jjb.git] / jjb-compare-xml.sh

diff --git a/jjb-compare-xml.sh b/jjb-compare-xml.sh
index 740daf3..98ad419 100755 (executable)
--- a/jjb-compare-xml.sh
+++ b/jjb-compare-xml.sh
@@ -13,7 +13,7 @@
 # from global-jjb's origin/master branch.
 
 test_dir=$(mktemp -d)
-script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/jjb
 expected_xml_dir="$(mktemp -d -t gjjb-XXXXXXXX)"
 
 echo "Script Directory: $script_dir"
@@ -25,7 +25,8 @@ gittmp="$(mktemp -d)"
 git worktree add --detach "$gittmp" origin/master
 pushd "$gittmp" || exit
 echo "Generating expected XML."
-jenkins-jobs test --recursive -o "$expected_xml_dir" "$gittmp":.jjb-test > /dev/null 2>&1
+jenkins-jobs test --recursive -o "$expected_xml_dir" \
+    "$gittmp":.jjb-test > /dev/null 2>&1
 popd || exit
 rm -r "$gittmp"
 
@@ -56,6 +57,7 @@ echo "No double curly braces found."
 rm -rf "$test_dir" "$expected_xml_dir"
 
 if $fail; then
-    echo "WARN: Differences detected. Check above for jobs that have been changed."
+    echo "WARN: Differences detected." \
+        "Check above for jobs that have been changed."
     exit 0
 fi