diff options
author | AJ <scisco@users.noreply.github.com> | 2014-07-17 15:57:26 -0400 |
---|---|---|
committer | AJ <scisco@users.noreply.github.com> | 2014-07-17 15:57:26 -0400 |
commit | 086585c95574596765f9ce15bef0ff539b2cd6e5 (patch) | |
tree | e7584d93b1e1680231f0f98810fa990b0f7d47e3 /scripts | |
parent | ea87493f9a91a0d853ea6dd5f6e4a25cb9d536db (diff) | |
parent | 54d4b6cc127a786506cbf4b0abc0ee8e8cc55c56 (diff) |
Merge pull request #16 from developmentseed/improvements
Making jekyll-hook compatible with Ubuntu 14.0
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build-v1.sh | 29 | ||||
-rwxr-xr-x | scripts/build.sh | 2 | ||||
-rwxr-xr-x | scripts/publish.sh | 4 |
3 files changed, 4 insertions, 31 deletions
diff --git a/scripts/build-v1.sh b/scripts/build-v1.sh deleted file mode 100755 index 0e85e39..0000000 --- a/scripts/build-v1.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -set -e - -# This script is meant to be run automatically -# as part of the jekyll-hook application. -# https://github.com/developmentseed/jekyll-hook - -repo=$1 -branch=$2 -owner=$3 -giturl=$4 -source=$5 -build=$6 - -# Check to see if repo exists. If not, git clone it -if [ ! -d $source ]; then - git clone $giturl $source -fi - -# Git checkout appropriate branch, pull latest code -cd $source -git checkout $branch -git pull origin $branch -cd - - -# Run jekyll -cd $source -jekyll build --source $source --destination $build -cd - diff --git a/scripts/build.sh b/scripts/build.sh index 4d689db..9eb4fe2 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -25,5 +25,5 @@ cd - # Run jekyll cd $source -jekyll $source $build --no-server --no-auto +jekyll build -s $source -d $build cd - diff --git a/scripts/publish.sh b/scripts/publish.sh index 82e728b..38b2143 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -13,8 +13,10 @@ source=$5 build=$6 # Set the path of the hosted site -site="/usr/share/nginx/www/$repo" +site="/usr/share/nginx/html/$repo" # Remove old site files, move new ones in place +# On amazon EC2 use sudo if nginx html forlder has root ownership + rm -rf $site mv $build $site |