[incubator-openwhisk-catalog] branch master updated: Remove unused parameter (#231)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

daisyguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-catalog.git


The following commit(s) were added to refs/heads/master by this push:
     new 95dab3c  Remove unused parameter (#231)
95dab3c is described below

commit 95dab3c5d71b3510e64b60626a3f4e87f147b71d
Author: Dan Lavine <dl...@us.ibm.com>
AuthorDate: Mon Jul 3 02:29:04 2017 -0700

    Remove unused parameter (#231)
    
    Remove unused parameter in installCatalog.sh
---
 packages/installCatalog.sh    | 2 +-
 packages/validateParameter.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
index e822152..f2917e7 100755
--- a/packages/installCatalog.sh
+++ b/packages/installCatalog.sh
@@ -8,7 +8,7 @@
 SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)"
 OPENWHISK_HOME=${OPENWHISK_HOME:-$SCRIPTDIR/../../openwhisk}
 
-source "$SCRIPTDIR/validateParameter.sh" $1 $2 $3 $4
+source "$SCRIPTDIR/validateParameter.sh" $1 $2 $3
 : ${WHISK_SYSTEM_AUTH:?"WHISK_SYSTEM_AUTH is not configured. Please input the correctly parameter: CATALOG_AUTH_KEY"}
 : ${WHISK_API_HOST:?"WHISK_API_HOST is not configured. Please input the correctly parameter: API_HOST"}
 : ${WHISK_CLI_PATH:?"WHISK_CLI_PATH is not configured. Please input the correctly parameter: cli_path"}
diff --git a/packages/validateParameter.sh b/packages/validateParameter.sh
index 5c33957..a8bb4ed 100755
--- a/packages/validateParameter.sh
+++ b/packages/validateParameter.sh
@@ -4,7 +4,7 @@
 #
 
 # The first argument is the catalog authentication key, which can be passed via either
-# a file or the key itself. 
+# a file or the key itself.
 CATALOG_AUTH_KEY=${1:-"$OPENWHISK_HOME/ansible/files/auth.whisk.system"}
 
 # If the auth key file exists, read the key in the file. Otherwise, take the
@@ -33,7 +33,7 @@ fi
 : ${API_HOST:?"API_HOST must be set and non-empty"}
 export WHISK_API_HOST=$API_HOST
 
-# The CLI path is passed as the fourth argument. If it is not provided, use
+# The CLI path is passed as the third argument. If it is not provided, use
 # "$OPENWHISK_HOME/bin/wsk" as the default value.
-cli_path=${4:-"$OPENWHISK_HOME/bin/wsk"}
+cli_path=${3:-"$OPENWHISK_HOME/bin/wsk"}
 export WHISK_CLI_PATH=$cli_path

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].