Skip to content

Commit

Permalink
Merge branch 'hotfix/2.12.4'
Browse files Browse the repository at this point in the history
* hotfix/2.12.4:
  Fix install script to work with empty MySQL passwords
  • Loading branch information
K-Ko committed Jan 10, 2016
2 parents ed789a3 + eb51482 commit 9e8e2bc
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions install
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
function e { echo =========================================================
echo "= $*"; echo =========================================================; }
### return default value $2, if $1 was empty
function d { ( [ "$1" ] && echo "$1" ) || echo "$2"; }
function d { [ "$1" ] && echo "$1" || echo "$2"; }

e 'Clone PVLng Github repository'
git clone https://github.com/KKoPV/PVLng.git .
Expand Down Expand Up @@ -63,11 +63,9 @@ done
params="-h $dbhost -P $dbport -u $dbuser"

[ "$dbsocket" ] && params="$params -S $dbsocket"
[ "$dbpass" ] && params="$params --password='$dbpass'"

e 'Import SQL definitions from sql/pvlng.sql ...'
#echo "mysql $params $dbname <$PWD/sql/pvlng.sql"
mysql $params $dbname <$PWD/sql/pvlng.sql
mysql $params --password="$dbpass" $dbname <$PWD/sql/pvlng.sql

e 'Prepare config/config.php and set database credentials'

Expand Down

0 comments on commit 9e8e2bc

Please sign in to comment.