commit 0ab4070108468d33019fd045ef25b4a9a400410d
author Carlos Sanchez <carlos@apache.org> Fri Aug 05 10:44:58 2016 +0200
committer Carlos Sanchez <carlos@apache.org> Fri Aug 05 10:44:58 2016 +0200
tree 9608cd996fc805b5f0fa7296654523805d5abca9
parent a24d3e4247539333cc990cba913ed368e25eb42b

Fix #319 Ignore plugins bundled under detached-plugins

They are not loaded by Jenkins in new installations

plugins.sh

diff --git a/plugins.sh b/plugins.sh
index 726ed86..027c382 100755
--- a/plugins.sh
+++ b/plugins.sh
@@ -12,6 +12,8 @@
 
 set -e
 
+echo "WARN: plugins.sh is deprecated, please switch to install-plugins.sh"
+
 if [ -z "$1" ]
 then
     echo "
@@ -62,7 +64,7 @@
     then
         echo "Analyzing war: $JENKINS_WAR"
         TEMP_PLUGIN_DIR=/tmp/plugintemp.$$
-        for i in `jar tf $JENKINS_WAR|egrep 'plugins'|egrep -v '\/$'|sort`
+        for i in `jar tf $JENKINS_WAR | egrep '[^detached-]plugins.*\..pi' | sort`
         do
             rm -fr $TEMP_PLUGIN_DIR
             mkdir -p $TEMP_PLUGIN_DIR