From 1ef9097c68b8f9513c95ffa5d2d042d0348ec658 Mon Sep 17 00:00:00 2001 From: Tim Birkett <109664963+portswigger-tim@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:47:54 +0100 Subject: [PATCH] [bitnami/grafana] feat: handle space separated GF_INSTALL_PLUGINS (#51889) * feat: handle space separated GF_INSTALL_PLUGINS Signed-off-by: Tim Birkett <109664963+portswigger-tim@users.noreply.github.com> * Doublequote to prevent globbing (SC2086) Signed-off-by: Miguel Ruiz Signed-off-by: Miguel Ruiz --------- Signed-off-by: Tim Birkett <109664963+portswigger-tim@users.noreply.github.com> Signed-off-by: Miguel Ruiz Co-authored-by: Miguel Ruiz --- .../10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh index 59db6a100431..8fbbb3e70649 100644 --- a/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh +++ b/bitnami/grafana/10/debian-11/rootfs/opt/bitnami/scripts/libgrafana.sh @@ -302,7 +302,7 @@ grafana_install_plugins() { [[ -z "$GF_INSTALL_PLUGINS" ]] && return local -a plugin_list - read -r -a plugin_list <<< "$(tr ',;' ' ' <<< "${GF_INSTALL_PLUGINS}")" + IFS="," read -r -a plugin_list <<< "$(tr ';' ',' <<< "${GF_INSTALL_PLUGINS}")" if [[ "${#plugin_list[@]}" -le 0 ]]; then warn "There are no plugins to install" return @@ -327,6 +327,11 @@ grafana_install_plugins() { plugin_id="${plugin_id_version_array[0]}" plugin_version="${plugin_id_version_array[1]}" info "Installing plugin ${plugin_id} @ ${plugin_version}" + elif grep ' ' <<< "$plugin"; then + read -r -a plugin_id_version_array <<< "$plugin" + plugin_id="${plugin_id_version_array[0]}" + plugin_version="${plugin_id_version_array[1]}" + info "Installing plugin ${plugin_id} @ ${plugin_version}" else info "Installing plugin ${plugin_id}" fi