Merge branch 'develop' into release/1.3.0

eclipse-iofog · Nov 7, 2019 · 1dd1190 · 1dd1190
2 parents 610dae5 + ddc58e6
commit 1dd1190
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 35 deletions.
diff --git a/init/iofog/.gitignore b/init/iofog/.gitignore
@@ -0,0 +1 @@
+local-stack.yaml
diff --git a/init/iofog/local-stack.yaml b/init/iofog/local-stack.yaml
diff --git a/utils.sh b/utils.sh
@@ -101,6 +101,22 @@ checkOSPlatform() {
 	export ID D_NUM
 }
 
+versionCompare() {
+    test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1";
+}
+
+checkIofogctl() {
+  IOFOGCTL_MINIMAL_VERSION="1.3.0"
+  if [[ -z "$(command -v iofogctl)" ]] ; then
+    echoError "iofogctl not found!"
+    exit 1;
+  fi
+  IOFOGCTL_VERSION=$(iofogctl version | sed -n 's/version: \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/p')
+  if versionCompare "${IOFOGCTL_MINIMAL_VERSION}" "${IOFOGCTL_VERSION}"; then
+    echoError "iofogctl version not sufficient!"
+    exit 1;
+  fi
+}
 #
 # The following are a bunch or pretty printing echo methods
 #
@@ -139,3 +155,4 @@ echoError() {
 
 # Are we in debug mode?
 checkForDebug
+checkIofogctl