ci: wrap sanity checks

diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh
index a570cd800842ed981597235f5d70a655ab894208..5967ae82624edd9ad4db94ca2a9ab63b449ea277 100755 (executable)
--- a/scripts/ci/common.sh
+++ b/scripts/ci/common.sh
@@ -73,13 +73,17 @@ gnuize () {
   rm -rf .git
 }
 
-if [ ! -d .git ]; then
-  echo "error: must be run from within the top level of a FreeSWITCH git tree." 1>&2
-  exit 1;
-fi
+check_pwd () {
+  if [ ! -d .git ]; then
+    echo "error: must be run from within the top level of a FreeSWITCH git tree." 1>&2
+    exit 1;
+  fi
+}
 
-if [ -z "$1" ]; then
-  echo "usage: $0 <version> <build-number>" 1>&2
-  exit 1;
-fi
+check_input_ver_build () {
+  if [ -z "$1" ]; then
+    echo "usage: $0 <version> <build-number>" 1>&2
+    exit 1;
+  fi
+}
 

diff --git a/scripts/ci/debsrcbuilder.sh b/scripts/ci/debsrcbuilder.sh
index 3dc56e5faa746cd660ca156367234e401f33f2f3..e5e429b1536c33bbd1d3f11aa21eb988d978588a 100755 (executable)
--- a/scripts/ci/debsrcbuilder.sh
+++ b/scripts/ci/debsrcbuilder.sh
@@ -5,6 +5,8 @@ sdir="."
 [ -n "${0%/*}" ] && sdir="${0%/*}"
 . $sdir/common.sh
 
+check_pwd
+check_input_ver_build
 eval $(parse_version "$1")
 datestamp="$(date +%Y%m%dT%H%M%SZ)"
 nightly="n${datestamp}"

diff --git a/scripts/ci/rpmbuilder.sh b/scripts/ci/rpmbuilder.sh
index 36b8b1d079c0506b23842c467b7a3f1f29c40cd2..563bfca104e9b292e039137402b5473147bc7fc3 100755 (executable)
--- a/scripts/ci/rpmbuilder.sh
+++ b/scripts/ci/rpmbuilder.sh
@@ -5,6 +5,8 @@ sdir="."
 [ -n "${0%/*}" ] && sdir="${0%/*}"
 . $sdir/common.sh
 
+check_pwd
+check_input_ver_build
 eval $(parse_version "$1")
 build="$2"
 

diff --git a/scripts/ci/sounds-en-us-callie.sh b/scripts/ci/sounds-en-us-callie.sh
index 39703028ca90a2112f1f326e01028296f2db1b10..6b3b0df0a62bcad0dcac60f3ddbb4539dbae9a73 100755 (executable)
--- a/scripts/ci/sounds-en-us-callie.sh
+++ b/scripts/ci/sounds-en-us-callie.sh
@@ -5,6 +5,8 @@ sdir="."
 [ -n "${0%/*}" ] && sdir="${0%/*}"
 . $sdir/common.sh
 
+check_pwd
+check_input_ver_build
 eval $(parse_version "$1")
 build="$2"
 

diff --git a/scripts/ci/src_tarball.sh b/scripts/ci/src_tarball.sh
index 7fd48621e371d83018db4bede88f2150dd094b19..d4c3adffa7f48f355a63a119ac6736a457ccd9a9 100755 (executable)
--- a/scripts/ci/src_tarball.sh
+++ b/scripts/ci/src_tarball.sh
@@ -5,6 +5,8 @@ sdir="."
 [ -n "${0%/*}" ] && sdir="${0%/*}"
 . $sdir/common.sh
 
+check_pwd
+check_input_ver_build
 eval $(parse_version "$1")
 
 dst_name="freeswitch-$cmajor.$cminor.$cmicro"