[incubator-openwhisk-package-deploy] branch master updated: readme and uninstall sh consistency (#4)

[cs...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 2a1d7ab  readme and uninstall sh consistency (#4)
2a1d7ab is described below

commit 2a1d7ab6e5a4971e1226a04406ab1890e67ab17a
Author: David Cariello <dr...@us.ibm.com>
AuthorDate: Thu Nov 16 14:15:31 2017 -0600

    readme and uninstall sh consistency (#4)
---
 README.md             | 12 ++++++++++++
 packages/uninstall.sh | 28 +++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4ac8d7e..6c0de6f 100644
--- a/README.md
+++ b/README.md
@@ -58,3 +58,15 @@ With the repository created, you can now deploy from it.
   -p gitUrl https://github.com/ibm-functions/blueprint-hello-world/
   -p manifestPath "src/openwhisk"
   ```
+
+# Working with repository
+
+## Deploying the Deploy Package using `installCatalog.sh`
+
+1. `git clone https://github.com/openwhisk/incubator-openwhisk-package-deploy`
+2. `cd incubator-openwhisk-package-deploy/packages`
+3. `./installCatalog.sh AUTH EDGE_HOST WSK_CLI DOCKER`
+   AUTH is your auth key.  EDGE_HOST is the OpenWhisk hostname.  WSK_CLI is location of the Openwhisk CLI binary. DOCKER is an optional param for the desired `wskdeploy` docker image, resolves to `openwhisk/wskdeploy:0.8.10` by default.
+
+> You can also remove the package using `uninstall.sh` in a similar fashion like so:
+> `./uninstall.sh AUTH EDGE_HOST WSK_CLI`
diff --git a/packages/uninstall.sh b/packages/uninstall.sh
index 3d9006b..60d3f70 100755
--- a/packages/uninstall.sh
+++ b/packages/uninstall.sh
@@ -1,17 +1,35 @@
 #!/bin/bash
+#
+# use the command line interface to uninstall standard actions deployed
+# automatically
+#
+# To run this command
+# ./uninstall.sh  <AUTH> <EDGE_HOST> <WSK_CLI>
+# AUTH and EDGE_HOST are found in $HOME/.wskprops
+# WSK_CLI="$OPENWHISK_HOME/bin/wsk"
 
 set -e
 set -x
-: ${OPENWHISK_HOME:?"OPENWHISK_HOME must be set and non-empty"}
-WSK_CLI="$OPENWHISK_HOME/bin/wsk"
 
 if [ $# -eq 0 ]
 then
-    echo "Usage: ./uninstall.sh $EDGE_HOST $AUTH"
+    echo "Usage: ./uninstall.sh <auth> <edgehost> <pathtowskcli>"
 fi
 
-EDGE_HOST="$1"
-AUTH="$2"
+AUTH="$1"
+EDGE_HOST="$2"
+WSK_CLI="$3"
+
+# If the auth key file exists, read the key in the file. Otherwise, take the
+# first argument as the key itself.
+if [ -f "$AUTH" ]; then
+    AUTH=`cat $AUTH`
+fi
+
+PACKAGE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+export WSK_CONFIG_FILE= # override local property file to avoid namespace clashes
+
 
 echo Uninstalling Template Package \
 

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