Skip to content

Commit 7f9f87c

Browse files
ltangvaldltangvald
committed
More consistent variable quoting
1 parent dda9ce8 commit 7f9f87c

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎5.5/docker-entrypoint.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ get_option () {
66
local option=$2
77
local default=$3
88
ret=$(my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
9-
[ -z $ret ] && ret=$default
9+
[ -z "$ret" ] && ret=$default
1010
echo $ret
1111
}
1212

@@ -27,17 +27,17 @@ if [ "$1" = 'mysqld' ]; then
2727
exit 1
2828
fi
2929
if [ ! -d "$DATADIR" ]; then
30-
mkdir -p $DATADIR
30+
mkdir -p "$DATADIR"
3131
fi
3232
chown -R mysql:mysql "$DATADIR"
3333

3434
echo 'Running mysql_install_db'
35-
mysql_install_db --user=mysql --datadir=$DATADIR --rpm
35+
mysql_install_db --user=mysql --datadir="$DATADIR" --rpm
3636
echo 'Finished mysql_install_db'
3737

38-
mysqld --user=mysql --datadir=$DATADIR --skip-networking &
38+
mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
3939
for i in $(seq 30 -1 0); do
40-
[ -S $SOCKET ] && break
40+
[ -S "$SOCKET" ] && break
4141
echo 'MySQL init process in progress...'
4242
sleep 1
4343
done
@@ -61,7 +61,7 @@ if [ "$1" = 'mysqld' ]; then
6161
EOSQL
6262

6363
if [ "$MYSQL_DATABASE" ]; then
64-
echo "CREATE DATABASE IF NOT EXISTS \`"$MYSQL_DATABASE"\` ;" >> "$tempSqlFile"
64+
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
6565
fi
6666

6767
if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
@@ -74,10 +74,10 @@ if [ "$1" = 'mysqld' ]; then
7474

7575
echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
7676

77-
mysql -uroot < $tempSqlFile
77+
mysql -uroot < "$tempSqlFile"
7878

79-
rm -f $tempSqlFile
80-
kill $(cat $PIDFILE)
79+
rm -f "$tempSqlFile"
80+
kill $(cat "$PIDFILE")
8181
for i in $(seq 30 -1 0); do
8282
[ -f "$PIDFILE" ] || break
8383
echo 'MySQL init process in progress...'

‎5.6/docker-entrypoint.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ get_option () {
66
local option=$2
77
local default=$3
88
ret=$(my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
9-
[ -z $ret ] && ret=$default
9+
[ -z "$ret" ] && ret=$default
1010
echo $ret
1111
}
1212

@@ -27,17 +27,17 @@ if [ "$1" = 'mysqld' ]; then
2727
exit 1
2828
fi
2929
if [ ! -d "$DATADIR" ]; then
30-
mkdir -p $DATADIR
30+
mkdir -p "$DATADIR"
3131
fi
3232
chown -R mysql:mysql "$DATADIR"
3333

3434
echo 'Running mysql_install_db'
35-
mysql_install_db --user=mysql --datadir=$DATADIR --rpm --keep-my-cnf
35+
mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --keep-my-cnf
3636
echo 'Finished mysql_install_db'
3737

38-
mysqld --user=mysql --datadir=$DATADIR --skip-networking &
38+
mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
3939
for i in $(seq 30 -1 0); do
40-
[ -S $SOCKET ] && break
40+
[ -S "$SOCKET" ] && break
4141
echo 'MySQL init process in progress...'
4242
sleep 1
4343
done
@@ -61,7 +61,7 @@ if [ "$1" = 'mysqld' ]; then
6161
EOSQL
6262

6363
if [ "$MYSQL_DATABASE" ]; then
64-
echo "CREATE DATABASE IF NOT EXISTS \`"$MYSQL_DATABASE"\` ;" >> "$tempSqlFile"
64+
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
6565
fi
6666

6767
if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
@@ -74,10 +74,10 @@ if [ "$1" = 'mysqld' ]; then
7474

7575
echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
7676

77-
mysql -uroot < $tempSqlFile
77+
mysql -uroot < "$tempSqlFile"
7878

79-
rm -f $tempSqlFile
80-
kill $(cat $PIDFILE)
79+
rm -f "$tempSqlFile"
80+
kill $(cat "$PIDFILE")
8181
for i in $(seq 30 -1 0); do
8282
[ -f "$PIDFILE" ] || break
8383
echo 'MySQL init process in progress...'

‎5.7/docker-entrypoint.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ get_option () {
66
local option=$2
77
local default=$3
88
ret=$(my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
9-
[ -z $ret ] && ret=$default
9+
[ -z "$ret" ] && ret=$default
1010
echo $ret
1111
}
1212

@@ -27,17 +27,17 @@ if [ "$1" = 'mysqld' ]; then
2727
exit 1
2828
fi
2929
if [ ! -d "$DATADIR" ]; then
30-
mkdir -p $DATADIR
30+
mkdir -p "$DATADIR"
3131
fi
3232
chown -R mysql:mysql "$DATADIR"
3333

3434
echo 'Initializing database'
35-
mysqld --initialize-insecure=on --user=mysql --datadir=$DATADIR
35+
mysqld --initialize-insecure=on --user=mysql --datadir="$DATADIR"
3636
echo 'Finished database init'
3737

38-
mysqld --user=mysql --datadir=$DATADIR --skip-networking &
38+
mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
3939
for i in $(seq 30 -1 0); do
40-
[ -S $SOCKET ] && break
40+
[ -S "$SOCKET" ] && break
4141
echo 'MySQL init process in progress...'
4242
sleep 1
4343
done
@@ -62,7 +62,7 @@ if [ "$1" = 'mysqld' ]; then
6262
EOSQL
6363

6464
if [ "$MYSQL_DATABASE" ]; then
65-
echo "CREATE DATABASE IF NOT EXISTS \`"$MYSQL_DATABASE"\` ;" >> "$tempSqlFile"
65+
echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;" >> "$tempSqlFile"
6666
fi
6767

6868
if [ "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
@@ -75,10 +75,10 @@ if [ "$1" = 'mysqld' ]; then
7575

7676
echo 'FLUSH PRIVILEGES ;' >> "$tempSqlFile"
7777

78-
mysql -uroot < $tempSqlFile
78+
mysql -uroot < "$tempSqlFile"
7979

80-
rm -f $tempSqlFile
81-
kill $(cat $PIDFILE)
80+
rm -f "$tempSqlFile"
81+
kill $(cat "$PIDFILE")
8282

8383
for i in $(seq 30 -1 0); do
8484
[ -f "$PIDFILE" ] || break

0 commit comments

Comments
 (0)