Merge pull request #59 from leojonathanoh/fix/fix-docker-entrypoint.s…

…h-printing-passed-arguments Fix: Fix `docker-entrypoint.sh` printing passed arguments
theohbrothers · Apr 6, 2024 · 44c5cf9 · 44c5cf9
2 parents 99d85eb + b17b5d8
commit 44c5cf9
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 72 deletions.
diff --git a/generate/templates/docker-entrypoint.sh.ps1 b/generate/templates/docker-entrypoint.sh.ps1
@@ -5,10 +5,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.1/docker-entrypoint.sh b/variants/3.0.1/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.2/docker-entrypoint.sh b/variants/3.0.2/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.3/docker-entrypoint.sh b/variants/3.0.3/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.4/docker-entrypoint.sh b/variants/3.0.4/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.5/docker-entrypoint.sh b/variants/3.0.5/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.6/docker-entrypoint.sh b/variants/3.0.6/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.7/docker-entrypoint.sh b/variants/3.0.7/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.8/docker-entrypoint.sh b/variants/3.0.8/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.0.9/docker-entrypoint.sh b/variants/3.0.9/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.0/docker-entrypoint.sh b/variants/3.1.0/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.1/docker-entrypoint.sh b/variants/3.1.1/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.2/docker-entrypoint.sh b/variants/3.1.2/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.3/docker-entrypoint.sh b/variants/3.1.3/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.4/docker-entrypoint.sh b/variants/3.1.4/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.5/docker-entrypoint.sh b/variants/3.1.5/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.6/docker-entrypoint.sh b/variants/3.1.6/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"

diff --git a/variants/3.1.7/docker-entrypoint.sh b/variants/3.1.7/docker-entrypoint.sh
@@ -4,10 +4,8 @@ set -eu
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
     SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
-    if echo "$SUBCOMMANDS" | grep "^$1$"; then
-        set "easyrsa" "$@"
-        echo "Executing: $@"
-        exec "$@"
+    if echo "$SUBCOMMANDS" | grep "^$1$" > /dev/null; then
+        exec "easyrsa" "$@"
     fi
 else
     exec "easyrsa" "$@"