summaryrefslogtreecommitdiff
path: root/nginx.sh
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-03-31 11:56:47 +0200
committerAndreas Maunz <andreas@maunz.de>2011-03-31 11:56:47 +0200
commit312d93bcc322fa5aca38f38cd266569aaf18b621 (patch)
tree670c31f02d166e5fd1fc33162bd401c1284b924a /nginx.sh
parentbe4c94b29fc76904b279056b6a0af234e7cf1f4e (diff)
all
Diffstat (limited to 'nginx.sh')
-rwxr-xr-xnginx.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/nginx.sh b/nginx.sh
index 0b7d983..6ccf914 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -20,9 +20,7 @@ source ./config.sh
source ./utils.sh
LOG="/tmp/`basename $0`-log.txt"
-echo "This installs Nginx."
-echo "Press <Return> to continue, or <Ctrl+C> to abort."
-read
+echo "Nginx ('$LOG')."
DIR="`pwd`"
@@ -33,7 +31,7 @@ if [ ! -d "$NGINX_DEST" ]; then
exit 1
else
if ! rmdir "$NGINX_DEST" >/dev/null 2>&1; then # if not empty this will fail
- echo "Install directory '$NGINX_DEST' is not empty. Skipping kernlab installation..."
+ echo "Install directory '$NGINX_DEST' not empty. Skipping nginx installation."
NGINX_DONE=true
fi
fi
@@ -53,5 +51,4 @@ if ! $NGINX_DONE; then
fi
cd "$DIR"
-echo
-echo "Nginx installation finished."
+