Browse Source

Fix nightlies


git-svn-id: http://svn.dmdirc.com/trunk@3035 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack 16 years ago
parent
commit
4cbdd6d3eb
1 changed files with 4 additions and 5 deletions
  1. 4
    5
      installer/jar/makeJar.sh

+ 4
- 5
installer/jar/makeJar.sh View File

32
 echo "-----------"
32
 echo "-----------"
33
 if [ -e "${RUNNAME}" ]; then
33
 if [ -e "${RUNNAME}" ]; then
34
 	echo "Removing existing file"
34
 	echo "Removing existing file"
35
-	rm -Rf ./*.jar
35
+	rm -Rf ${RUNNAME}
36
 fi
36
 fi
37
 
37
 
38
 showHelp() {
38
 showHelp() {
135
 		if [ "${updateSVN}" = "true" ]; then
135
 		if [ "${updateSVN}" = "true" ]; then
136
 			svn update
136
 			svn update
137
 		fi
137
 		fi
138
-		rm -Rf build dist
139
-		ant jar
138
+		ant clean jar
140
 		if [ ! -e "dist/DMDirc.jar" ]; then
139
 		if [ ! -e "dist/DMDirc.jar" ]; then
141
 			echo "There was an error creating the .jar file. Aborting."
140
 			echo "There was an error creating the .jar file. Aborting."
142
 			exit 1;
141
 			exit 1;
149
 fi;
148
 fi;
150
 
149
 
151
 echo "Copying jar (${jarfile}).."
150
 echo "Copying jar (${jarfile}).."
152
-cp ${jarfile} "./DMDirc.jar"
151
+cp ${jarfile} ${RUNNAME}
153
 
152
 
154
 echo "Adding plugins to jar"
153
 echo "Adding plugins to jar"
155
 ln -sf ${jarPath}"/plugins"
154
 ln -sf ${jarPath}"/plugins"
157
 for plugin in ${plugins}; do
156
 for plugin in ${plugins}; do
158
 	pluginList=${pluginList}" plugins/${plugin}"
157
 	pluginList=${pluginList}" plugins/${plugin}"
159
 done
158
 done
160
-jar -uvf "DMDirc.jar" ${pluginList}
159
+jar -uvf "${RUNNAME}" ${pluginList}
161
 rm -Rf plugins;
160
 rm -Rf plugins;
162
 
161
 
163
 if [ "${isRelease}" != "" ]; then
162
 if [ "${isRelease}" != "" ]; then

Loading…
Cancel
Save