From 1a7ee4ca317e3b4ecee8d145e3890f64df7f6b69 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Wed, 14 Jul 2021 21:32:17 +0200
Subject: [PATCH] stick to one convention

---
 Dockerfile | 2 +-
 buildx.sh  | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cf78a60..4c267cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ LABEL org.opencontainers.image.authors=support@privatebin.org \
 
 RUN \
 # Prepare composer dependencies
-    ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')"
+    ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')" ;\
     ALPINE_COMPOSER_PACKAGES="" ;\
     if [ -n "${COMPOSER_PACKAGES}" ] ; then \
         ALPINE_COMPOSER_PACKAGES="php8 php8-curl php8-mbstring php8-phar" ;\
diff --git a/buildx.sh b/buildx.sh
index d26e20a..a0e597e 100755
--- a/buildx.sh
+++ b/buildx.sh
@@ -46,15 +46,13 @@ is_image_push_required() {
 main() {
     local PUSH TAG IMAGE BUILD_ARGS
 
-    if [ "$EVENT" = schedule ]
-    then
+    if [ "$EVENT" = schedule ] ; then
         TAG=nightly
     else
         TAG=${GITHUB_REF##*/}
     fi
 
-    if is_image_push_required
-    then
+    if is_image_push_required ; then
         PUSH=true
         docker_login
     else
@@ -63,8 +61,7 @@ main() {
 
     sed -e 's/^FROM alpine:.*$/FROM alpine:edge/' Dockerfile > Dockerfile.edge
 
-    image_build_arguments | while read -r IMAGE BUILD_ARGS
-    do
+    image_build_arguments | while read -r IMAGE BUILD_ARGS ; do
         build_image $PUSH --tag "$IMAGE:latest" --tag "$IMAGE:$TAG" "$BUILD_ARGS"
         build_image $PUSH -f Dockerfile.edge    --tag "$IMAGE:edge" "$BUILD_ARGS"
     done