From 5017e2f3b8865db62c2420cd0101426a46a8714f Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 17 Nov 2011 09:00:16 +0100
Subject: Fixed nginx installer

---
 nginx.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nginx.sh b/nginx.sh
index 32efc96..ed8a3df 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -53,12 +53,15 @@ servername=`hostname`
 $GIT checkout nginx.conf>>$LOG 2>&1
 cmd="sed -i -e \"s,PASSENGER,$passenger,;s,SERVERNAME,$servername,;s,RUBY_DEST,$RUBY_DEST,;s,NGINX_DEST,$NGINX_DEST,;s,WWW_DEST,$WWW_DEST,\" ./nginx.conf" && run_cmd "$cmd" "Config"
 cmd="sed -i -e \"s,USER,`whoami`,\" ./nginx.conf" && run_cmd "$cmd" "User"
-NGINX_PORT=`echo "$NGINX_PORT" | sed 's/^.//g'`
+
 if [ -z "$NGINX_PORT" ]; then
   NGINX_PORT=80
+else
+  NGINX_PORT=`echo "$NGINX_PORT" | sed 's/^.//g'`
 fi
 cmd="sed -i -e \"s,NGINX_PORT,$NGINX_PORT,\" ./nginx.conf" && run_cmd "$cmd" "NGINX_PORT"
 cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy"
+$GIT checkout nginx.conf>>$LOG 2>&1
 
 if [ ! -f $NGINX_CONF ]; then
   echo "if ! echo \"\$PATH\" | grep \"$NGINX_DEST\">/dev/null 2>&1; then export PATH=$NGINX_DEST/sbin:\$PATH; fi" >> "$NGINX_CONF"
-- 
cgit v1.2.3