Fix (docker-entrypoint.sh): Fix detection of easyrsa subcommands fo…

…r 3.1.6
theohbrothers · Sep 25, 2023 · 3c92f68 · 3c92f68
1 parent 8466d26
commit 3c92f68
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/generate/templates/docker-entrypoint.sh.ps1 b/generate/templates/docker-entrypoint.sh.ps1
@@ -4,7 +4,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.1/docker-entrypoint.sh b/variants/v3.0.1/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.2/docker-entrypoint.sh b/variants/v3.0.2/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.3/docker-entrypoint.sh b/variants/v3.0.3/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.4/docker-entrypoint.sh b/variants/v3.0.4/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.5/docker-entrypoint.sh b/variants/v3.0.5/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.6/docker-entrypoint.sh b/variants/v3.0.6/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.7/docker-entrypoint.sh b/variants/v3.0.7/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.8/docker-entrypoint.sh b/variants/v3.0.8/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.0.9/docker-entrypoint.sh b/variants/v3.0.9/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.0/docker-entrypoint.sh b/variants/v3.1.0/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.1/docker-entrypoint.sh b/variants/v3.1.1/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.2/docker-entrypoint.sh b/variants/v3.1.2/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.3/docker-entrypoint.sh b/variants/v3.1.3/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.4/docker-entrypoint.sh b/variants/v3.1.4/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.5/docker-entrypoint.sh b/variants/v3.1.5/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"

diff --git a/variants/v3.1.6/docker-entrypoint.sh b/variants/v3.1.6/docker-entrypoint.sh
@@ -3,7 +3,7 @@ set -eu
 
 if [ $# -gt 0 ]; then
     # Get all subcommands. 'help' is also a subcommand
-    SUBCOMMANDS=$( easyrsa | awk "/^'help'/,/^DIRECTORY/" | grep -vE "^'help'|^DIRECTORY|^\s*$" | awk '{print $1}'; echo help )
+    SUBCOMMANDS=$( easyrsa help | awk "/init-pki/,/^$/" | awk '{print $1}' | awk NF ; echo help )
     if echo "$SUBCOMMANDS" | grep "^$1$"; then
         set "easyrsa" "$@"
         echo "Executing: $@"