commit 867228ee63ce457b4200c60d829e0ef7c7c0dd35
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Oct 17 16:54:55 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 18 11:11:46 2016 -0700
tree 38dc732e86073965521a4e1a92ce89fabac3d043
parent 9d7f8fe0b6141d6998d34d793d019212531b3bde

build+ci: Synchronize build and CI scripts with ndn-cxx/NFD

This commit also fixes a minor problem causing compilation warnings.

Change-Id: I0c04d58fe9df24f181947b9fde1346283402fc7b

.jenkins.d/util.sh

diff --git a/.jenkins.d/util.sh b/.jenkins.d/util.sh
index 81c8931..a89bc27 100644
--- a/.jenkins.d/util.sh
+++ b/.jenkins.d/util.sh
@@ -1,9 +1,18 @@
 has() {
+    local saved_xtrace
+    [[ $- == *x* ]] && saved_xtrace=-x || saved_xtrace=+x
+    set +x
+
     local p=$1
     shift
-    local x
-    for x in "$@"; do
-        [[ "${x}" == "${p}" ]] && return 0
+    local i ret=1
+    for i in "$@"; do
+        if [[ "${i}" == "${p}" ]]; then
+            ret=0
+            break
+        fi
     done
-    return 1
+
+    set ${saved_xtrace}
+    return ${ret}
 }