From 05410828048f02c37729f38758efd255dfd85255 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Mon, 6 Dec 2010 13:11:37 +0100
Subject: [PATCH] Fixing server when no git files, not on master

Allows server to run even if on another branch than master and/or
in a production scenario without git files available.
---
 script/server | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/script/server b/script/server
index 09c93b868..f03af9381 100755
--- a/script/server
+++ b/script/server
@@ -76,7 +76,11 @@ fi
 
 # Force AGPL
 if [ -w public -a ! -e  public/source.tar.gz ]; then
-    tar czf public/source.tar.gz  `git ls-tree -r master | awk '{print $4}'`
+    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
 fi
 if [ ! -e public/source.tar.gz ]; then
     echo "Error: Can't find, or even create, public/source.tar.gz. Exiting" >&2
@@ -84,13 +88,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/assets/main.js.gz' ]; then
+if [ ! -e 'public/stylesheets/application.css' ]; then
     echo 'Jammit precache error (now or at install)' >&2
     exit 66
 fi