createPluginJar.sh can now cope with friendly version names

Fixes issue 2155

createPluginJar.sh

@@ -39,25 +39,26 @@ fi;
 # This is rudimentary, it a version: section already exists (eg to specify
 # friendlyversion) then it won't add the number= key.
 if [ -e META-INF/plugin.config ]; then
-	if ! grep "^version:" META-INF/plugin.config >/dev/null; then
-		SVN=`which svn`	
-		SVNREV=`$SVN info $srcdir/src/$foldername 2>&1 | grep "Last Changed Rev"`
-		SVNREV=${SVNREV##*: }
-		echo "" >> META-INF/plugin.config
-		echo "" >> META-INF/plugin.config
-	
-		echo "version:" >> META-INF/plugin.config;
-		if [ -n "$SVNREV" ]; then
-			echo "  number=$SVNREV" >> META-INF/plugin.config;
-		else
-			echo "  number=0" >> META-INF/plugin.config;
-		fi
-		
-		# Add to keysections list
+	VERSIONLINE=`grep -n "version:$" META-INF/plugin.config | cut -f 1 -d ':'`
+
+	if [ -z "$VERSIONLINE" ]; then
 		sed 's/keysections:/keysections:\n  version/g' META-INF/plugin.config > META-INF/plugin.config.temp
 		rm -Rf META-INF/plugin.config
-		mv META-INF/plugin.config.temp META-INF/plugin.config
-	fi
+		mv META-INF/plugin.config.temp META-INF/plugin.config		
+	fi;
+
+	SVN=`which svn`	
+	SVNREV=`$SVN info $srcdir/src/$foldername 2>&1 | grep "Last Changed Rev"`
+	SVNREV=${SVNREV##*: }
+	echo "" >> META-INF/plugin.config
+	echo "" >> META-INF/plugin.config
+	
+	echo "version:" >> META-INF/plugin.config;
+	if [ -n "$SVNREV" ]; then
+		echo "  number=$SVNREV" >> META-INF/plugin.config;
+	else
+		echo "  number=0" >> META-INF/plugin.config;
+	fi;
 fi;
 
 foo=`echo $foldername | sed -e 's/\/[^\/]*$//g'`

src/com/dmdirc/addons/addonbrowser/plugin.config

@@ -7,7 +7,7 @@ keysections:
   metadata
   requires
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -22,8 +22,8 @@ requires:
 updates:
   id=26
 
-#version:
-#  friendly=0.1
+version:
+  friendly=0.1
 
 provides:
   addonbrowser component

src/com/dmdirc/addons/audio/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Shane <shane@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=14
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   audio command

src/com/dmdirc/addons/dcc/plugin.config

@@ -10,7 +10,7 @@ keysections:
   defaults
   formatters
   icons
-#  version
+  version
 
 metadata:
   author=Shane <shane@dmdirc.com>
@@ -25,8 +25,8 @@ requires:
 updates:
   id=23
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 persistent:
   com.dmdirc.addons.dcc.actions.DCCActions

src/com/dmdirc/addons/dcop/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=1
 
-#version:
-#  friendly=0.3
+version:
+  friendly=0.3
 
 persistent:
 

src/com/dmdirc/addons/dns/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Greboid <greg@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=10
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   dns command

src/com/dmdirc/addons/identd/plugin.config

@@ -7,7 +7,7 @@ keysections:
   metadata
   updates
   defaults
-#  version
+  version
 
 metadata:
   author=Shane <shane@dmdirc.com>
@@ -19,8 +19,8 @@ metadata:
 updates:
   id=15
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   ident feature

src/com/dmdirc/addons/lagdisplay/plugin.config

@@ -8,7 +8,7 @@ keysections:
   updates
   requires
   defaults
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -23,8 +23,8 @@ requires:
 updates:
   id=2
 
-#version:
-#  friendly=0.5
+version:
+  friendly=0.5
 
 provides:
   lagdisplay statusbar_entry

src/com/dmdirc/addons/logging/plugin.config

@@ -8,7 +8,7 @@ keysections:
   requires
   updates
   defaults
-#  version
+  version
 
 metadata:
   author=Shane <shane@dmdirc.com>
@@ -23,8 +23,8 @@ requires:
 updates:
   id=16
 
-#version:
-#  friendly=0.5
+version:
+  friendly=0.5
 
 provides:
   logging command

src/com/dmdirc/addons/mediasource_dcop/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Greboid <greg@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=9
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   amarok mediasource

src/com/dmdirc/addons/mediasource_vlc/plugin.config

@@ -24,8 +24,8 @@ requires:
 updates:
   id=24
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   vlc mediasource

src/com/dmdirc/addons/mediasource_windows/plugin.config

@@ -22,8 +22,8 @@ requires:
 updates:
   id=30
 
-#version:
-#  friendly=0.1
+version:
+  friendly=0.1
 
 provides:
   winamp mediasource

src/com/dmdirc/addons/nickcolours/plugin.config

@@ -7,7 +7,7 @@ keysections:
   metadata
   updates
   defaults
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -19,8 +19,8 @@ metadata:
 updates:
   id=12
 
-#version:
-#  friendly=0.6
+version:
+  friendly=0.6
 
 persistent:
 

src/com/dmdirc/addons/nowplaying/plugin.config

@@ -9,7 +9,7 @@ keysections:
   updates
   defaults
   icons
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -24,8 +24,8 @@ requires:
 updates:
   id=8
 
-#version:
-#  friendly=0.5
+version:
+  friendly=0.5
 
 persistent:
   com.dmdirc.addons.nowplaying.MediaSource

src/com/dmdirc/addons/osd/plugin.config

@@ -8,7 +8,7 @@ keysections:
   requires
   updates
   defaults
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -23,8 +23,8 @@ requires:
 updates:
   id=3
 
-#version:
-#  friendly=0.3
+version:
+  friendly=0.3
 
 provides:
   osd command

src/com/dmdirc/addons/redirect/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=4
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   redirect command

src/com/dmdirc/addons/systray/plugin.config

@@ -7,7 +7,7 @@ keysections:
   metadata
   updates
   defaults
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -19,8 +19,8 @@ metadata:
 updates:
   id=5
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 provides:
   popup command

src/com/dmdirc/addons/tabcompletion_bash/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=43
 
-#version:
-#  friendly=0
+version:
+  friendly=0
 
 provides:
   bash tabcompletion

src/com/dmdirc/addons/tabcompletion_mirc/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=44
 
-#version:
-#  friendly=0
+version:
+  friendly=0
 
 provides:
   mirc tabcompletion

src/com/dmdirc/addons/time/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=6
 
-#version:
-#  friendly=0.2
+version:
+  friendly=0.2
 
 persistent:
   com.dmdirc.addons.time.TimeActionType

src/com/dmdirc/addons/ui_dummy/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -19,8 +19,8 @@ metadata:
 updates:
   id=41
 
-#version:
-#  friendly=0.6
+version:
+  friendly=0.6
 
 provides:
   dummy ui

src/com/dmdirc/addons/ui_swing/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -19,8 +19,8 @@ metadata:
 updates:
   id=42
 
-#version:
-#  friendly=0.6
+version:
+  friendly=0.6
 
 provides:
   swing ui

src/com/dmdirc/addons/urlcatcher/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=25
 
-#version:
-#  friendly=0.1
+version:
+  friendly=0.1
 
 provides:
 

src/com/dmdirc/addons/userlevel/plugin.config

@@ -6,7 +6,7 @@
 keysections:
   metadata
   updates
-#  version
+  version
 
 metadata:
   author=Chris <chris@dmdirc.com>
@@ -18,8 +18,8 @@ metadata:
 updates:
   id=21
 
-#version:
-#  friendly=0.1
+version:
+  friendly=0.1
 
 persistent:
   com.dmdirc.addons.userlevel.AccessLevelComponent

src/com/dmdirc/addons/windowstatus/plugin.config

@@ -8,7 +8,7 @@ keysections:
   requires
   updates
   defaults
-#  version
+  version
 
 metadata:
   author=Shane <shane@dmdirc.com>
@@ -23,8 +23,8 @@ requires:
 updates:
   id=13
 
-#version:
-#  friendly=0.5
+version:
+  friendly=0.5
 
 provides:
   windowstatus statusbar_entry