From 683eddab7e8a28b060abf72227e98e006001ff60 Mon Sep 17 00:00:00 2001 From: Seth Gibelyou Date: Tue, 30 May 2017 11:32:49 -0600 Subject: [PATCH 1/4] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d7995ac..ef16ccd 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,10 @@ It must be installed to `/srv/walnut/packages/pages/org.oauth3` ```bash git clone git@git.daplie.com:OAuth3/org.oauth3.git /srv/walnut/packages/pages/org.oauth3 +pushd /srv/walnut/packages/pages/org.oauth3 git checkout fs-nosql bash ./install.sh +popd ``` This uses the OAuth3 JavaScript SDK `oauth3.js` as a subpackage in `/srv/walnut/packages/pages/org.oauth3/assets/org.oauth3`. From fe81df00ee37bb20cc7ba59e6855230f53f02f89 Mon Sep 17 00:00:00 2001 From: Seth Gibelyou Date: Tue, 30 May 2017 11:33:59 -0600 Subject: [PATCH 2/4] Update README.md again --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ef16ccd..bd5a2cd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ It must be installed to `/srv/walnut/packages/pages/org.oauth3` ```bash git clone git@git.daplie.com:OAuth3/org.oauth3.git /srv/walnut/packages/pages/org.oauth3 pushd /srv/walnut/packages/pages/org.oauth3 -git checkout fs-nosql bash ./install.sh popd ``` From c59c9a3cc772023c1fddc0e3290216170dc35495 Mon Sep 17 00:00:00 2001 From: tigerbot Date: Tue, 30 May 2017 11:39:46 -0600 Subject: [PATCH 3/4] fixed logical check in install script --- .gitignore | 2 ++ install.sh | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 install.sh diff --git a/.gitignore b/.gitignore index a9e8050..4249b68 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *.*sw* +bower_components/ +assets/ diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index 52ec282..3598813 --- a/install.sh +++ b/install.sh @@ -1,10 +1,12 @@ #!/bin/bash +set -e +set -u # git clone git@git.daplie.com:OAuth3/org.oauth3.git /srv/walnut/packages/pages/org.oauth3 mkdir -p assets -if [ -d ./assets/org.oauth3 ]; then - git clone git@git.daplie.com:Daplie/oauth3.js.git ./assets/org.oauth3 +if ! [ -d ./assets/org.oauth3 ]; then + git clone git@git.daplie.com:Daplie/oauth3.js.git ./assets/org.oauth3 fi pushd ./assets/org.oauth3 git checkout v1 From dd3ed04fedf22754afb5e47c89af222e657c46c3 Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Tue, 30 May 2017 21:57:45 -0600 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index bd5a2cd..9e2c100 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,8 @@ bash ./install.sh popd ``` +```bash +echo "org.oauth3" >> /srv/walnut/packages/sites/EXAMPLE.COM +``` + This uses the OAuth3 JavaScript SDK `oauth3.js` as a subpackage in `/srv/walnut/packages/pages/org.oauth3/assets/org.oauth3`.