From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Sun, 29 Mar 2009 16:18:18 +0000 (+0200)
Subject: addsite: Create the directory properly.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=b436a7b3f9038c19993e031189dfef12a5601a0a;p=matthijs%2Fservers%2Fdrsnuggles.git

addsite: Create the directory properly.
---

diff --git a/usr/local/bin/addsite b/usr/local/bin/addsite
index c0ecae8..815ecfc 100755
--- a/usr/local/bin/addsite
+++ b/usr/local/bin/addsite
@@ -21,16 +21,25 @@ PHP_CONFIG=conf/php.ini.override
 # PHP error logfile to set error_log to
 PHP_ERRORLOG=logs/php.log
 
-# Get dir, but make it absolute
-cd "$1"
-DIR=`pwd`
-
+# Get dir
+DIR="$1"
 
-if [ -e "$DIR" -a ! -d "$DIR" ]; then
-	echo "$DIR" must be a directory, or not exist yet.
-	exit 1;
+if [ -e "$DIR" ]; then
+	if [ ! -d "$DIR" ]; then
+		echo "$DIR" must be a directory, or not exist yet.
+		exit 1;
+	fi
+	echo "Skipping creation of $DIR, it already exists";
+else
+	# Create $DIR from $TEMPLATE_DIR, if it does not exist yet
+	echo "Creating $DIR from $TEMPLATE_DIR"
+	cp -R "$TEMPLATE_DIR" "$DIR"
 fi
 
+# Make $DIR absolute
+cd "$DIR"
+DIR=`pwd`
+
 # Strip prefix
 SITE=`basename $DIR`
 
@@ -77,14 +86,6 @@ else
 	exit 1
 fi
 
-if [ -e "$DIR" ]; then
-	echo "Skipping creation of $DIR, it already exists";
-else
-	# Create $DIR from $TEMPLATE_DIR, if it does not exist yet
-	echo "Creating $DIR from $TEMPLATE_DIR"
-	cp -R "$TEMPLATE_DIR" "$DIR"
-fi
-
 echo "Setting up permissions"
 # Set up permissions
 sudo chown -R 0:$GROUP "$DIR"