Moved bash version detection to top and improved logic (#4578)

swagger-api · Jan 17, 2017 · 545ee0c · 545ee0c
1 parent 713e6bb
commit 545ee0c
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/bash/client.mustache b/modules/swagger-codegen/src/main/resources/bash/client.mustache
@@ -25,6 +25,20 @@
 # {{#externalDocs}}{{url}}{{/externalDocs}}
 #
 
+###############################################################################
+#
+# Make sure Bash is at least in version 4.3
+#
+###############################################################################
+if ! ( (("${BASH_VERSION:0:1}" == "4")) && (("${BASH_VERSION:2:1}" >= "3")) ) \
+  && ! (("${BASH_VERSION:0:1}" >= "5")); then
+    echo ""
+    echo "Sorry - your Bash version is ${BASH_VERSION}"
+    echo ""
+    echo "You need at least Bash 4.3 to run this script."
+    echo ""
+    exit 1
+fi
 
 ###############################################################################
 # 
@@ -899,14 +913,6 @@ call_{{operationId}}() {
 ##############################################################################
 
 
-# Make sure Bash is at least in version 4.3
-if [[ ${BASH_VERSION:0:1} < 4 && ${BASH_VERSION:2:1} < 3 ]]; then
-    echo "Sorry - your Bash version is ${BASH_VERSION}"
-    echo ""
-    echo "You need at least Bash 4.3 to run this script."
-    exit 1
-fi
-
 # Check dependencies
 type curl >/dev/null 2>&1 || { echo >&2 "Error: You do not have 'cURL' installed."; exit 1; }
 type sed >/dev/null 2>&1 || { echo >&2 "Error: You do not have 'sed' installed."; exit 1; }