Correct tarball resolving.

Make errors within parantheses fatal.
Improve a few comments.

1 files changed, 8 insertions, 9 deletions

diff --git a/localezcreate b/localezcreate
index 3df495e..72427f6 100755
--- a/localezcreate
+++ b/localezcreate
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localezcreate
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localezcreate,v 1.19 2002-12-08 15:06:22 jonas Exp $
+# $Id: localezcreate,v 1.20 2002-12-08 15:28:21 jonas Exp $
 #
 # Create local eZ Publish site
 #
@@ -93,9 +93,8 @@ function usage() {
 	echo "MySQL password for \$dbuser can be stored in \$HOME/.my.cnf of \$user."
 }
 
-function setparams () {
+function setparams () { # TODO: Handle default argument '[[ASK]]', and fail loudly on empty defaults
 	for param in $@; do
-		# TODO: Check here if default exists or fail loudly
 		eval "$param=`eval \"echo \"\\\"\$\{$param:-\\\$default${param}\}\\\"\"\"`"
 		[ $verbose ] && echo "--> $param="`eval echo \$\{$param\}`
 	done
@@ -171,7 +170,7 @@ echo "Installing $host..."
 
 setparams $opts3
 
-if [ -d $basedir -o -d $webcfg ]; then
+if [ -d $basedir -o -d $webcfg ]; then # TODO: Check for MySQL database as well
 	echo "WARNING: Target dir or Apache config snippet already exists."
 	echo -n "         Purge existing installation (y/N)?: "
 	read -s ack
@@ -231,7 +230,7 @@ for chunk in $sqlchunks; do
 	if [ "$found" = "1" ]; then
 		if [ -e /usr/share/wwwconfig-common/mysql-exec.sh ] ; then
 			status=""
-			(cd $sqldir && . /usr/share/wwwconfig-common/mysql-exec.sh)
+			(cd $sqldir && . /usr/share/wwwconfig-common/mysql-exec.sh) || exit 1
 			if [ "$status" = "error" ] ; then
 				echo "$error"
 				exit 1
@@ -250,13 +249,13 @@ done
 
 for area in source language template; do
 	[ $verbose ] && echo -n "Unpacking $area files: "
-	for tarball in `eval echo \$\{$area\}s`; do
+	for tarball in `eval echo \$\{${area}s\}`; do
 		[ $verbose ] && echo -n "$tarball"
 		found=""
-		for dir in `eval echo \$\{$area\}dirs`; do
+		for dir in `eval echo \$\{${area}dirs\}`; do
 			if [ -f $dir/$tarball.tar.gz ]; then
 				found="1"
-				(cd $basedir; tar -xz -C $basedir -f $dir/$tarball.tar.gz)
+				(cd $basedir && tar -xz -C $basedir -f $dir/$tarball.tar.gz) || exit 1
 				break
 			fi
 		done
@@ -311,7 +310,7 @@ ReplyAddress=$mailuser@$maildomain
 chown -R $user:$group $basedir
 
 [ $verbose ] && echo "Configuring Apache"
-echo "# Generated for $pkg by $(basename $0)
+echo "# Generated by $prg
 <VirtualHost *>
 	ServerName	$host.$domain
 	ServerAdmin	$mailuser@$maildomain