nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Fixing server when no git files, not on master"

Browse source 
Wrong usecase. The real problem is always using the master branch.
There is no point using a files list, distributions will just
create the tar archive in advance.

This reverts commit 0541082804.
This commit is contained in:
Alec Leamas 2010-12-06 14:49:32 +01:00
parent 7aa7c29b46
commit 36e6c9f68e
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
script/server
View file

@ -76,11 +76,7 @@ fi
# Force AGPL # Force AGPL
if [ -w public -a ! -e public/source.tar.gz ]; then if [ -w public -a ! -e public/source.tar.gz ]; then
if [ -r config/git-ls-tree ]; then tar czf public/source.tar.gz `git ls-tree -r master | awk '{print $4}'`
tar czf public/source.tar.gz $( cat config/git-ls-tree)
else
tar czf public/source.tar.gz `git ls-tree -r master | awk '{print $4}'`
fi
fi fi
if [ ! -e public/source.tar.gz ]; then if [ ! -e public/source.tar.gz ]; then
echo "Error: Can't find, or even create, public/source.tar.gz. Exiting" >&2 echo "Error: Can't find, or even create, public/source.tar.gz. Exiting" >&2
@ -88,13 +84,13 @@ if [ ! -e public/source.tar.gz ]; then
fi fi
# Precache jammit assets # Precache jammit assets
if [[ -w public && ! -e 'public/stylesheets/application.css' ]]; then if [[ -w public && ! -e public/stylesheets/application.css ]]; then
if [ "$INIT_PUBLIC" != 'no' ]; then if [ "$INIT_PUBLIC" != 'no' ]; then
echo "Making first-time server initialization." echo "Making first-time server initialization."
init_public init_public
fi fi
fi fi
if [ ! -e 'public/stylesheets/application.css' ]; then if [ ! -e 'public/assets/main.js.gz' ]; then
echo 'Jammit precache error (now or at install)' >&2 echo 'Jammit precache error (now or at install)' >&2
exit 66 exit 66
fi fi