From 5d463b46c0fd6ea2526604c04847a94207405491 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Thu, 29 Nov 2018 02:13:20 -0600 Subject: [PATCH] Fix bug enabling plugins Fix bug when using the environment variable COMANAGE_REGISTRY_ENABLE_PLUGIN to specify a comma separated list of plugins to enable where the comma separated list was not parsed correctly. --- comanage-registry-basic-auth/docker-comanage-entrypoint | 2 +- comanage-registry-internet2-tier/docker-comanage-entrypoint | 2 +- comanage-registry-mod-auth-openidc/docker-comanage-entrypoint | 2 +- comanage-registry-shibboleth-sp/docker-comanage-entrypoint | 2 +- comanage-registry/docker-comanage-entrypoint | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/comanage-registry-basic-auth/docker-comanage-entrypoint b/comanage-registry-basic-auth/docker-comanage-entrypoint index 3ac29bf..0b4081e 100755 --- a/comanage-registry-basic-auth/docker-comanage-entrypoint +++ b/comanage-registry-basic-auth/docker-comanage-entrypoint @@ -235,7 +235,7 @@ fi # Enable any supported non-core plugins if requested. if [ -n "$COMANAGE_REGISTRY_ENABLE_PLUGIN" ]; then - plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @'`) > "$OUTPUT" 2>&1 + plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @g'`) > "$OUTPUT" 2>&1 for plugin in "${plugins[@]}"; do echo "Enabling available plugin $plugin..." > "$OUTPUT" 2>&1 diff --git a/comanage-registry-internet2-tier/docker-comanage-entrypoint b/comanage-registry-internet2-tier/docker-comanage-entrypoint index 6191e13..d1b63cb 100755 --- a/comanage-registry-internet2-tier/docker-comanage-entrypoint +++ b/comanage-registry-internet2-tier/docker-comanage-entrypoint @@ -269,7 +269,7 @@ fi # Enable any supported non-core plugins if requested. if [ -n "$COMANAGE_REGISTRY_ENABLE_PLUGIN" ]; then - plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @'`) > "$OUTPUT" 2>&1 + plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @g'`) > "$OUTPUT" 2>&1 for plugin in "${plugins[@]}"; do echo "Enabling available plugin $plugin..." > "$OUTPUT" 2>&1 diff --git a/comanage-registry-mod-auth-openidc/docker-comanage-entrypoint b/comanage-registry-mod-auth-openidc/docker-comanage-entrypoint index cc71042..c988d8c 100755 --- a/comanage-registry-mod-auth-openidc/docker-comanage-entrypoint +++ b/comanage-registry-mod-auth-openidc/docker-comanage-entrypoint @@ -235,7 +235,7 @@ fi # Enable any supported non-core plugins if requested. if [ -n "$COMANAGE_REGISTRY_ENABLE_PLUGIN" ]; then - plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @'`) > "$OUTPUT" 2>&1 + plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @g'`) > "$OUTPUT" 2>&1 for plugin in "${plugins[@]}"; do echo "Enabling available plugin $plugin..." > "$OUTPUT" 2>&1 diff --git a/comanage-registry-shibboleth-sp/docker-comanage-entrypoint b/comanage-registry-shibboleth-sp/docker-comanage-entrypoint index 1fb302b..2d7e2ef 100755 --- a/comanage-registry-shibboleth-sp/docker-comanage-entrypoint +++ b/comanage-registry-shibboleth-sp/docker-comanage-entrypoint @@ -235,7 +235,7 @@ fi # Enable any supported non-core plugins if requested. if [ -n "$COMANAGE_REGISTRY_ENABLE_PLUGIN" ]; then - plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @'`) > "$OUTPUT" 2>&1 + plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @g'`) > "$OUTPUT" 2>&1 for plugin in "${plugins[@]}"; do echo "Enabling available plugin $plugin..." > "$OUTPUT" 2>&1 diff --git a/comanage-registry/docker-comanage-entrypoint b/comanage-registry/docker-comanage-entrypoint index ab9c0ef..d409d42 100755 --- a/comanage-registry/docker-comanage-entrypoint +++ b/comanage-registry/docker-comanage-entrypoint @@ -235,7 +235,7 @@ fi # Enable any supported non-core plugins if requested. if [ -n "$COMANAGE_REGISTRY_ENABLE_PLUGIN" ]; then - plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @'`) > "$OUTPUT" 2>&1 + plugins=(`echo "$COMANAGE_REGISTRY_ENABLE_PLUGIN" | sed -e 's@,@ @g'`) > "$OUTPUT" 2>&1 for plugin in "${plugins[@]}"; do echo "Enabling available plugin $plugin..." > "$OUTPUT" 2>&1