[GitHub] beemarie closed pull request #8: env variable instead of param for installCatalog

[GitBox <gi...@apache.org>]

beemarie closed pull request #8: env variable instead of param for installCatalog
URL: https://github.com/apache/incubator-openwhisk-package-deploy/pull/8
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
index ae1ca14..098a0ff 100755
--- a/packages/installCatalog.sh
+++ b/packages/installCatalog.sh
@@ -13,25 +13,19 @@ set -x
 
 if [ $# -eq 0 ]
   then
-  echo "Usage: ./installCatalog.sh <authkey> <edgehost> <pathtowskcli> <skipdeploy> <docker>"
+  echo "Usage: ./installCatalog.sh <authkey> <edgehost> <pathtowskcli> <docker>"
 fi
 
 AUTH="$1"
 EDGE_HOST="$2"
 WSK_CLI="$3"
-SKIP_DEPLOY="${4:-False}"
-DOCKER="$5"
+DOCKER="$4"
+SKIP_DEPLOY="${SKIP_DEPLOY:-True}"
 
 # If docker is not provided, set to default version.
-if [ -z "$5" ]
-  then
-  if [ $SKIP_DEPLOY = False ] || [ $SKIP_DEPLOY = True ]
+if [ -z "$4" ]
   then
     DOCKER="openwhisk/wskdeploy:0.8.10"
-  else
-    SKIP_DEPLOY=False
-    DOCKER=$4
-  fi
 fi
 
 # If the auth key file exists, read the key in the file. Otherwise, take the
@@ -44,7 +38,7 @@ PACKAGE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 export WSK_CONFIG_FILE= # override local property file to avoid namespace clashes
 
-#clone all Blueprints
+# clone all Blueprints
 for bp in blueprint-hello-world blueprint-cloudant-trigger blueprint-messagehub-trigger
 do
   if [ -e actions/blueprints/$bp ]


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services