|
@@ -2198,7 +2198,6 @@ function get_mariadb_password {
|
2198
|
2198
|
if [ -f /home/$MY_USERNAME/README ]; then
|
2199
|
2199
|
if grep -q "MariaDB password" /home/$MY_USERNAME/README; then
|
2200
|
2200
|
MARIADB_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
2201
|
|
- echo "MariaDB password: $MARIADB_PASSWORD"
|
2202
|
2201
|
fi
|
2203
|
2202
|
fi
|
2204
|
2203
|
}
|
|
@@ -2207,7 +2206,6 @@ function get_mariadb_gnusocial_admin_password {
|
2207
|
2206
|
if [ -f /home/$MY_USERNAME/README ]; then
|
2208
|
2207
|
if grep -q "MariaDB gnusocial admin password" /home/$MY_USERNAME/README; then
|
2209
|
2208
|
MICROBLOG_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "MariaDB gnusocial admin password" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
2210
|
|
- echo "MariaDB gnusocial admin password: $MICROBLOG_ADMIN_PASSWORD"
|
2211
|
2209
|
fi
|
2212
|
2210
|
fi
|
2213
|
2211
|
}
|
|
@@ -2288,7 +2286,7 @@ CREATE USER 'gnusocialadmin'@'localhost' IDENTIFIED BY '$MICROBLOG_ADMIN_PASSWOR
|
2288
|
2286
|
GRANT ALL PRIVILEGES ON gnusocial.* TO 'gnusocialadmin'@'localhost';
|
2289
|
2287
|
quit" > $INSTALL_DIR/batch.sql
|
2290
|
2288
|
chmod 600 $INSTALL_DIR/batch.sql
|
2291
|
|
- mysql -u root --password=$MARIADB_PASSWORD < $INSTALL_DIR/batch.sql
|
|
2289
|
+ mysql -u root --password="$MARIADB_PASSWORD" < $INSTALL_DIR/batch.sql
|
2292
|
2290
|
shred -zu $INSTALL_DIR/batch.sql
|
2293
|
2291
|
|
2294
|
2292
|
echo 'install_gnu_social' >> $COMPLETION_FILE
|