From 9d54d5975c72b079271295804137fd78abcad816 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 27 Sep 2014 09:43:33 +0100 Subject: [PATCH] Tidying --- install-freedombone.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/install-freedombone.sh b/install-freedombone.sh index bae5c946..6c3dace1 100755 --- a/install-freedombone.sh +++ b/install-freedombone.sh @@ -2198,7 +2198,6 @@ function get_mariadb_password { if [ -f /home/$MY_USERNAME/README ]; then if grep -q "MariaDB password" /home/$MY_USERNAME/README; then MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//') - echo "MariaDB password: $MARIADB_PASSWORD" fi fi } @@ -2207,7 +2206,6 @@ function get_mariadb_gnusocial_admin_password { if [ -f /home/$MY_USERNAME/README ]; then if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//') - echo "MariaDB gnusocial admin password: $MICROBLOG_ADMIN_PASSWORD" fi fi } @@ -2288,7 +2286,7 @@ CREATE USER 'gnusocialadmin'@'localhost' IDENTIFIED BY '$MICROBLOG_ADMIN_PASSWOR GRANT ALL PRIVILEGES ON gnusocial.* TO 'gnusocialadmin'@'localhost'; quit" > $INSTALL_DIR/batch.sql chmod 600 $INSTALL_DIR/batch.sql - mysql -u root --password=$MARIADB_PASSWORD < $INSTALL_DIR/batch.sql + mysql -u root --password="$MARIADB_PASSWORD" < $INSTALL_DIR/batch.sql shred -zu $INSTALL_DIR/batch.sql echo 'install_gnu_social' >> $COMPLETION_FILE