summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlocalezcreate11
1 files changed, 8 insertions, 3 deletions
diff --git a/localezcreate b/localezcreate
index c926b64..0449d06 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.25 2003-04-25 04:07:17 jonas Exp $
+# $Id: localezcreate,v 1.26 2003-05-12 03:27:51 jonas Exp $
#
# Create local eZ Publish site
#
@@ -234,7 +234,13 @@ if [ -n "$verbose" ]; then
echo "--> Check for existing installation"
fi
error=""
-if [ -d $basedir ]; then
+if mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "show databases;" | grep -eq "^$dbname$"; then
+ if [ -n "$verbose" ]; then
+ error="Database $dbname already exists."
+ else
+ error="Database already exists."
+ fi
+elif [ -d $basedir ]; then
if [ -n "$verbose" ]; then
error="Target directory $basedir already exists."
else
@@ -247,7 +253,6 @@ elif [ -f $webcfg ]; then
error="Apache config already exists."
fi
fi
-# TODO: Check for existing MySQL database
if [ -n "$error" ]; then
if [ -n "$query" ]; then
echo "WARNING: $error"