Skip to content

Commit

Permalink
gracefully handle unavailable git in script/server
Browse files Browse the repository at this point in the history
  • Loading branch information
jhass committed May 20, 2013
1 parent 6691180 commit 63b667b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
## Bug fixes

* Don't use Pathname early to circumvent some rare initialization errors [#3816](https://github.com/diaspora/diaspora/issues/3816)
* Don't error out in script/server if git is unavailable.

## Features

Expand Down
14 changes: 11 additions & 3 deletions script/server
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,21 @@ fi
# Force AGPL
if [ -w "public" -a ! -e "public/source.tar.gz" ]
then
branch=$(git branch | awk '/^[*]/ {print $2}')
tar czf public/source.tar.gz $(git ls-tree -r $branch | awk '{print $4}')
if command -v git > /dev/null 2>&1 && git rev-parse --is-inside-work-tree > /dev/null 2>&1
then
branch=$(git branch | awk '/^[*]/ {print $2}')
tar czf public/source.tar.gz $(git ls-tree -r $branch | awk '{print $4}')
else
fatal <<MSG
Can't generate public/source.tar.gz for you. Please tar up a copy of
your Diaspora installtion and place it there.
MSG
fi
fi

if [ ! -e "public/source.tar.gz" ]
then
fatal "Can't find, or even create, public/source.tar.gz."
fatal "Can't find public/source.tar.gz"
fi

# Check if assets are precompiled
Expand Down

0 comments on commit 63b667b

Please sign in to comment.