diff --git a/14.0/entrypoint.sh b/14.0/entrypoint.sh
index f802bcb..4a4bbfe 100755
--- a/14.0/entrypoint.sh
+++ b/14.0/entrypoint.sh
@@ -3,7 +3,7 @@
 set -e
 
 if [ -v PASSWORD_FILE ]; then
-    PASSWORD="$(< $PASSWORD_FILE)"
+    PASSWORD="$(<$PASSWORD_FILE)"
 fi
 
 # set the postgres database host, port, user and password according to the environment
@@ -17,9 +17,9 @@ DB_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
-    if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then       
-        value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
-    fi;
+    if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC"; then
+        value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" | cut -d " " -f3 | sed 's/["\n\r]//g')
+    fi
     DB_ARGS+=("--${param}")
     DB_ARGS+=("${value}")
 }
@@ -29,21 +29,22 @@ check_config "db_user" "$USER"
 check_config "db_password" "$PASSWORD"
 
 case "$1" in
-    -- | odoo)
-        shift
-        if [[ "$1" == "scaffold" ]] ; then
-            exec odoo "$@"
-        else
-            wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}"
-        fi
-        ;;
-    -*)
+-- | odoo)
+    shift
+    if [[ "$1" == "scaffold" ]]; then
+        exec odoo "$@"
+    else
         wait-for-psql.py ${DB_ARGS[@]} --timeout=30
         exec odoo "$@" "${DB_ARGS[@]}"
-        ;;
-    *)
-        exec "$@"
+    fi
+    ;;
+-*)
+    wait-for-psql.py ${DB_ARGS[@]} --timeout=30
+    exec odoo "$@" "${DB_ARGS[@]}"
+    ;;
+*)
+    exec "$@"
+    ;;
 esac
 
 exit 1
diff --git a/15.0/entrypoint.sh b/15.0/entrypoint.sh
index f802bcb..4a4bbfe 100755
--- a/15.0/entrypoint.sh
+++ b/15.0/entrypoint.sh
@@ -3,7 +3,7 @@
 set -e
 
 if [ -v PASSWORD_FILE ]; then
-    PASSWORD="$(< $PASSWORD_FILE)"
+    PASSWORD="$(<$PASSWORD_FILE)"
 fi
 
 # set the postgres database host, port, user and password according to the environment
@@ -17,9 +17,9 @@ DB_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
-    if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then       
-        value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
-    fi;
+    if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC"; then
+        value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" | cut -d " " -f3 | sed 's/["\n\r]//g')
+    fi
     DB_ARGS+=("--${param}")
     DB_ARGS+=("${value}")
 }
@@ -29,21 +29,22 @@ check_config "db_user" "$USER"
 check_config "db_password" "$PASSWORD"
 
 case "$1" in
-    -- | odoo)
-        shift
-        if [[ "$1" == "scaffold" ]] ; then
-            exec odoo "$@"
-        else
-            wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}"
-        fi
-        ;;
-    -*)
+-- | odoo)
+    shift
+    if [[ "$1" == "scaffold" ]]; then
+        exec odoo "$@"
+    else
         wait-for-psql.py ${DB_ARGS[@]} --timeout=30
         exec odoo "$@" "${DB_ARGS[@]}"
-        ;;
-    *)
-        exec "$@"
+    fi
+    ;;
+-*)
+    wait-for-psql.py ${DB_ARGS[@]} --timeout=30
+    exec odoo "$@" "${DB_ARGS[@]}"
+    ;;
+*)
+    exec "$@"
+    ;;
 esac
 
 exit 1
diff --git a/16.0/entrypoint.sh b/16.0/entrypoint.sh
index f802bcb..4a4bbfe 100755
--- a/16.0/entrypoint.sh
+++ b/16.0/entrypoint.sh
@@ -3,7 +3,7 @@
 set -e
 
 if [ -v PASSWORD_FILE ]; then
-    PASSWORD="$(< $PASSWORD_FILE)"
+    PASSWORD="$(<$PASSWORD_FILE)"
 fi
 
 # set the postgres database host, port, user and password according to the environment
@@ -17,9 +17,9 @@ DB_ARGS=()
 function check_config() {
     param="$1"
     value="$2"
-    if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then       
-        value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
-    fi;
+    if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC"; then
+        value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" | cut -d " " -f3 | sed 's/["\n\r]//g')
+    fi
     DB_ARGS+=("--${param}")
     DB_ARGS+=("${value}")
 }
@@ -29,21 +29,22 @@ check_config "db_user" "$USER"
 check_config "db_password" "$PASSWORD"
 
 case "$1" in
-    -- | odoo)
-        shift
-        if [[ "$1" == "scaffold" ]] ; then
-            exec odoo "$@"
-        else
-            wait-for-psql.py ${DB_ARGS[@]} --timeout=30
-            exec odoo "$@" "${DB_ARGS[@]}"
-        fi
-        ;;
-    -*)
+-- | odoo)
+    shift
+    if [[ "$1" == "scaffold" ]]; then
+        exec odoo "$@"
+    else
         wait-for-psql.py ${DB_ARGS[@]} --timeout=30
         exec odoo "$@" "${DB_ARGS[@]}"
-        ;;
-    *)
-        exec "$@"
+    fi
+    ;;
+-*)
+    wait-for-psql.py ${DB_ARGS[@]} --timeout=30
+    exec odoo "$@" "${DB_ARGS[@]}"
+    ;;
+*)
+    exec "$@"
+    ;;
 esac
 
 exit 1