From 8250f5cdd283bc3cc23198245ce8906d131db5b2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 12 May 2003 03:39:26 +0000 Subject: Allow mysql to fail, and use mysql instead of mysqladmin. --- localaddmysqldb | 18 +++++++++--------- localezcreate | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/localaddmysqldb b/localaddmysqldb index 5167f90..71a566c 100755 --- a/localaddmysqldb +++ b/localaddmysqldb @@ -3,7 +3,7 @@ # /usr/local/sbin/localaddmysqldb # Copyright 2001-2002 Jonas Smedegaard # -# $Id: localaddmysqldb,v 1.1 2003-05-12 03:28:31 jonas Exp $ +# $Id: localaddmysqldb,v 1.2 2003-05-12 03:40:20 jonas Exp $ # # Add/update MySQL database # @@ -183,7 +183,7 @@ if [ -z "$dbadmpass" ]; then exit 1 fi fi -alldb=`mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "show databases;" | grep -v '^Database$'` +alldb=`mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "show databases;" | grep -v '^Database$'` ############################################## # The rest of the script is dbname-specific... # @@ -225,7 +225,7 @@ if [ -n "$error" ]; then exit 1 fi else - mysqladmin -u$dbadmin -p$dbadmpass $optdbserver -f drop $dbname + mysql -u$dbadmin -p$dbadmpass $optdbserver -f -e "DROP DATABASE $dbname;" fi else echo "ERROR: $error!" @@ -247,7 +247,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 @@ -261,18 +261,18 @@ if [ -e /usr/share/wwwconfig-common/mysql-createuser.sh ] ; then exit 1 fi for h in `echo "localhost $dballow" | sort -u`; do -# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" - mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "REVOKE DELETE,CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';" +# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';" + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "REVOKE DELETE,CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';" done else for h in `echo "localhost $dballow" | sort -u`; do -# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" - mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT SELECT,INSERT,UPDATE ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" +# mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';" done fi for h in `echo "localhost $dballow" | sort -u`; do - mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -f -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser-admin'@'$h' IDENTIFIED BY '$dbpass';" + mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser-admin'@'$h' IDENTIFIED BY '$dbpass';" done done 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 # -# $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 -- cgit v1.2.3