From f3da324c9f8866e7bb96fa76c534813a4977f65f Mon Sep 17 00:00:00 2001
From: Ankit Wal <ankit.wal@gmail.com>
Date: Mon, 22 Apr 2019 23:09:46 +0800
Subject: [PATCH] [stable/sonarqube] Resolve duplicate plugin files causing
 server start up failure (#12694)

copy-plugins script checks and removes duplicate files of same plugins before copying downloaded plugins from tmp directory

Signed-off-by: Ankit Wal <ankit.wal@gmail.com>
---
 stable/sonarqube/Chart.yaml                  |  2 +-
 stable/sonarqube/templates/copy-plugins.yaml | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/stable/sonarqube/Chart.yaml b/stable/sonarqube/Chart.yaml
index 8865e484e9..c62e6da8c3 100644
--- a/stable/sonarqube/Chart.yaml
+++ b/stable/sonarqube/Chart.yaml
@@ -1,6 +1,6 @@
 name: sonarqube
 description: Sonarqube is an open sourced code quality scanning tool
-version: 0.15.1
+version: 0.15.2
 appVersion: 7.7
 keywords:
   - coverage
diff --git a/stable/sonarqube/templates/copy-plugins.yaml b/stable/sonarqube/templates/copy-plugins.yaml
index 7293c4f094..2e53971909 100644
--- a/stable/sonarqube/templates/copy-plugins.yaml
+++ b/stable/sonarqube/templates/copy-plugins.yaml
@@ -13,6 +13,17 @@ data:
       {{- if .Values.plugins.deleteDefaultPlugins }}
       rm -f /opt/sonarqube/extensions/plugins/*.jar
       {{- end }}
+      for f in /opt/sonarqube/extensions/plugins/tmp/*.jar
+      do
+        file=${f##*/} && file=${file%-[0-9]*} 
+        for original in /opt/sonarqube/extensions/plugins/*.jar
+        do
+          originalfile=${original##*/} && originalfile=${originalfile%-[0-9]*} 
+          if [ "$originalfile" = "$file" ]; then
+            rm -f "$original"
+          fi
+        done
+      done
       cp /opt/sonarqube/extensions/plugins/tmp/*.jar /opt/sonarqube/extensions/plugins/
       /opt/sonarqube/bin/run.sh