Skip to content

Commit 0b8cb40

Browse files
yosifkityosifkit
committed
Add missing -n's to bash test
1 parent cc7a484 commit 0b8cb40

13 files changed

+26
-26
lines changed

‎10/alpine/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

‎10/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

‎11/alpine/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

‎11/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

‎12/alpine/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

‎12/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

‎9.4/alpine/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_XLOGDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
7878
set -- --xlogdir "$POSTGRES_INITDB_XLOGDIR" "$@"
7979
fi
8080

‎9.4/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_XLOGDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
7878
set -- --xlogdir "$POSTGRES_INITDB_XLOGDIR" "$@"
7979
fi
8080

‎9.5/alpine/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_XLOGDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
7878
set -- --xlogdir "$POSTGRES_INITDB_XLOGDIR" "$@"
7979
fi
8080

‎9.5/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_XLOGDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
7878
set -- --xlogdir "$POSTGRES_INITDB_XLOGDIR" "$@"
7979
fi
8080

‎9.6/alpine/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_XLOGDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
7878
set -- --xlogdir "$POSTGRES_INITDB_XLOGDIR" "$@"
7979
fi
8080

‎9.6/docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_XLOGDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_XLOGDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_XLOGDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_XLOGDIR" ]; then
7878
set -- --xlogdir "$POSTGRES_INITDB_XLOGDIR" "$@"
7979
fi
8080

‎docker-entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ docker_create_db_directories() {
4444
chmod 775 /var/run/postgresql || :
4545

4646
# Create the transaction log directory before initdb is run so the directory is owned by the correct user
47-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
47+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
4848
mkdir -p "$POSTGRES_INITDB_WALDIR"
4949
if [ "$user" = '0' ]; then
5050
find "$POSTGRES_INITDB_WALDIR" \! -user postgres -exec chown postgres '{}' +
@@ -74,7 +74,7 @@ docker_init_database_dir() {
7474
echo "postgres:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
7575
fi
7676

77-
if [ "$POSTGRES_INITDB_WALDIR" ]; then
77+
if [ -n "$POSTGRES_INITDB_WALDIR" ]; then
7878
set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
7979
fi
8080

0 commit comments

Comments
 (0)