This is an automated email from the ASF dual-hosted git repository.
rabbah 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 2df3794 Add debug information. (#295)
2df3794 is described below
commit 2df3794b0aa72e4410da229f4c39f0e70d1bbc97
Author: rodric rabbah <[email protected]>
AuthorDate: Fri Feb 15 13:26:22 2019 -0500
Add debug information. (#295)
---
packages/installCatalogUsingWskdeploy.sh | 4 ----
packages/util.sh | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/packages/installCatalogUsingWskdeploy.sh
b/packages/installCatalogUsingWskdeploy.sh
index a7f7eba..830873d 100755
--- a/packages/installCatalogUsingWskdeploy.sh
+++ b/packages/installCatalogUsingWskdeploy.sh
@@ -18,10 +18,6 @@
# use the command line interface to install standard actions deployed
# automatically
#
-
-SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)"
-
-
: ${OPENWHISK_HOME:?"OPENWHISK_HOME must be set and non-empty"}
SCRIPTDIR="$(cd $(dirname "$0")/ && pwd)"
diff --git a/packages/util.sh b/packages/util.sh
index b76bd8e..8ac58db 100755
--- a/packages/util.sh
+++ b/packages/util.sh
@@ -55,12 +55,12 @@ function install() {
function deployProject() {
RELATIVE_PATH=$1
REST=("${@:2}")
- CMD_ARRAY=("$WHISK_CLI_PATH" -i --apihost "$EDGE_HOST" project deploy
--auth "$AUTH_KEY" --project "$RELATIVE_PATH" "${REST[@]}")
+ CMD_ARRAY=("$WHISK_CLI_PATH" -i --apihost "$EDGE_HOST" project deploy
--auth "$AUTH_KEY" --namespace _ --project "$RELATIVE_PATH" "${REST[@]}")
export WSK_CONFIG_FILE= #override local property file to avoid namespace
clashes
"${CMD_ARRAY[@]}" &
PID=$!
PIDS+=($PID)
- echo "Deploying with pid $PID"
+ echo "Deploying $RELATIVE_PATH with pid $PID"
}
function runPackageInstallScript() {