From 36e6c9f68ea865de2e57430d912a78a456fd57e8 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Mon, 6 Dec 2010 14:49:32 +0100 Subject: [PATCH] Revert "Fixing server when no git files, not on master" 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 05410828048f02c37729f38758efd255dfd85255. --- script/server | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/script/server b/script/server index 8ee933c73..6a65756c0 100755 --- a/script/server +++ b/script/server @@ -76,11 +76,7 @@ fi # Force AGPL if [ -w public -a ! -e public/source.tar.gz ]; then - if [ -r config/git-ls-tree ]; then - 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 + tar czf public/source.tar.gz `git ls-tree -r master | awk '{print $4}'` fi if [ ! -e public/source.tar.gz ]; then 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 # 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 echo "Making first-time server initialization." init_public 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 exit 66 fi