diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2003-05-12 03:39:26 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2003-05-12 03:39:26 +0000 |
| commit | 8250f5cdd283bc3cc23198245ce8906d131db5b2 (patch) | |
| tree | 4ca65a1215ea457459f19ccc3d129e5d5cca6660 /localezcreate | |
| parent | 310583c61dcad3fc39586537658124cf48977bb5 (diff) | |
Allow mysql to fail, and use mysql instead of mysqladmin.
Diffstat (limited to 'localezcreate')
| -rwxr-xr-x | localezcreate | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/localezcreate b/localezcreate index 0449d06..2b87797 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.26 2003-05-12 03:27:51 jonas Exp $ +# $Id: localezcreate,v 1.27 2003-05-12 03:39:26 jonas Exp $ # # Create local eZ Publish site # @@ -234,7 +234,7 @@ if [ -n "$verbose" ]; then echo "--> Check for existing installation" fi error="" -if mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "show databases;" | grep -eq "^$dbname$"; then +if mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "show databases;" | grep -eq "^$dbname$"; then if [ -n "$verbose" ]; then error="Database $dbname already exists." else @@ -265,7 +265,7 @@ if [ -n "$error" ]; then esac fi if [ -n "$force" ]; then - mysqladmin -u$dbadmin -p$dbadmpass $optdbserver -f drop $dbname + mysql -u$dbadmin -p$dbadmpass $optdbserver -f -e "DROP DATABASE $dbname;" rm -rf $basedir rm -f $webcfg else @@ -288,7 +288,7 @@ if [ -e /usr/share/wwwconfig-common/mysql-createdb.sh ] ; then fi else # TODO: Purge existing database as the wwwconfig-common script does - mysqladmin -u$dbadmin -p$dbadmpass $optdbserver create $dbname + mysql -u$dbadmin -p$dbadmpass $optdbserver -e "CREATE DATABASE $dbname;" fi if [ -n "$verbose" ]; then @@ -302,11 +302,11 @@ if [ -e /usr/share/wwwconfig-common/mysql-createuser.sh ] ; then exit 1 fi for h in `echo "localhost $dballow" | sort -u`; do - echo "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" | mysql -u$dbadmin -p$dbadmpass $optdbserver mysql + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" done else for h in `echo "localhost $dballow" | sort -u`; do - echo "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" | mysql -u$dbadmin -p$dbadmpass $optdbserver mysql + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" done fi |