Skip to content

Commit 6df9599

Browse files
pizkazpizkaz
committed
chore(entrypoint): Fix whitespace issues
Signed-off-by: Sebastian Neuser <[email protected]>
1 parent f0a7a8c commit 6df9599

File tree

10 files changed

+60
-60
lines changed

10 files changed

+60
-60
lines changed

‎29/apache/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎29/fpm-alpine/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎29/fpm/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎30/apache/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎30/fpm-alpine/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎30/fpm/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎31/apache/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎31/fpm-alpine/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

‎31/fpm/entrypoint.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
240240
echo "Starting nextcloud installation"
241241
max_retries=10
242242
try=0
243-
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
243+
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
244244
do
245245
echo "Retrying install..."
246246
try=$((try+1))
@@ -252,21 +252,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
252252
fi
253253
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
254254
echo "Setting trusted domains…"
255-
set -f # turn off glob
255+
set -f # turn off glob
256256
NC_TRUSTED_DOMAIN_IDX=1
257257
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
258258
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
259259
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
260260
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
261261
done
262-
set +f # turn glob back on
262+
set +f # turn glob back on
263263
fi
264264

265265
run_path post-installation
266-
fi
266+
fi
267267
fi
268-
# not enough specified to do a fully automated installation
269-
if [ "$install" = false ]; then
268+
# not enough specified to do a fully automated installation
269+
if [ "$install" = false ]; then
270270
echo "Next step: Access your instance to finish the web-based installation!"
271271
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
272272
fi

0 commit comments

Comments
 (0)