Browse Source

Remove plugins added by ant before handing teh jar over to the installer

tags/0.6.3m1rc1
Shane Mc Cormack 15 years ago
parent
commit
5153f91b6a
1 changed files with 4 additions and 1 deletions
  1. 4
    1
      BuildAll.sh

+ 4
- 1
BuildAll.sh View File

@@ -84,6 +84,9 @@ if [ ! -e "$MYDIR/dist/DMDirc.jar" ]; then
84 84
 	fi
85 85
 else
86 86
 	# Build installers
87
+	# Delete all automatically added plugins from the jar to allow the installer
88
+	# to add its own on a per-os basis
89
+	unzip -l ${MYDIR}/dist/DMDirc.jar | grep " plugins/" | tr -s ' ' | cut -d ' ' -f 5- | xargs zip ${MYDIR}/dist/DMDirc.jar -d
87 90
 	cd "${MYDIR}/installer"
88 91
 	./release.sh --jar "${MYDIR}/dist/DMDirc.jar" --opt "--extra ${FILEDATA}" trunk
89 92
 	cd "${MYDIR}"
@@ -98,7 +101,7 @@ else
98 101
 		fi
99 102
 	fi;
100 103
 
101
-	# Add plugins to jar
104
+	# Re-Add all plugins to the jar so that the nightly .jar has everything.
102 105
 	$JAR -uvf "dist/DMDirc.jar" plugins
103 106
 
104 107
 	# Submit plugins to addons site

Loading…
Cancel
Save