aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-installer-orig
diff options
context:
space:
mode:
authorM.Gergo2019-11-24 11:27:40 +0100
committerM.Gergo2019-11-24 11:27:40 +0100
commit502843a035833f82321ed990ada1eda23612ed92 (patch)
tree16c39b0987926f4b62f30c48297ef3126403fbff /mayor-orig/mayor-installer-orig
parent0e8de1ea03765f564bc1757504e0d8c14334b79e (diff)
downloadmayor-502843a035833f82321ed990ada1eda23612ed92.tar.gz
mayor-502843a035833f82321ed990ada1eda23612ed92.zip
Rev: 4574rev4574
Diffstat (limited to 'mayor-orig/mayor-installer-orig')
-rwxr-xr-xmayor-orig/mayor-installer-orig/install.d/35createdatabases.sh6
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
2 files changed, 4 insertions, 4 deletions
diff --git a/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh b/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh
index d44d28e4..33407920 100755
--- a/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh
@@ -98,7 +98,7 @@ read -n 1 -p "Telepíthetem? (i/N)" -s DO
if [ "$DO" != "i" ]; then echo " ok, kiléptem..."; exit 1; fi
echo -e "\n"
-read -p " A mysql root jelszó (a begépelt szöveg nem látszik!): " -s MYSQLROOTPW
+read -p " A mysql root jelszó - ha van - (a begépelt szöveg nem látszik!): " -s MYSQLROOTPW
if [ ! -e $MAYORDIR/config/main.conf ]; then
cat $MAYORDIR/config/main.conf.example | sed s/%SQLPW%/$MYSQLROOTPW/ > $MAYORDIR/config/main.conf
@@ -107,9 +107,9 @@ fi
if [ "$MYSQLROOTPW" = "" ];
then
- MYSQLROOTPWSTR="";
+ MYSQLROOTPWSTR="-f";
else
- MYSQLROOTPWSTR="-p$MYSQLROOTPW --user=root"
+ MYSQLROOTPWSTR="-f -p$MYSQLROOTPW --user=root"
fi
cat /tmp/mysql/mayor-login.sql | mysql $MYSQLROOTPWSTR --default-character-set=utf8
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4572
+4574