Fix settings update properly, it is now done after we have built the installer.jar

git-svn-id: http://svn.dmdirc.com/trunk@3040 00569f92-eb28-0410-84fd-f71c24880f

installer/release.sh

@@ -174,24 +174,6 @@ if [ $? -ne 0 ]; then
 	exit 1;
 fi
 
-# Copy default settings from www to trunk for compile (if they exist, and we are
-# building a new jar)
-REVERTLIST=""
-if [ "" != "${JARFILE}" ]; then
-	if [ -e "${HOME}/www/updates/" ]; then
-		echo "================================================================"
-		echo "Applying settings update to this source"
-		echo "================================================================"
-		for updatedir in `ls -1 ../src/com/dmdirc/config/defaults/`; do
-			src="${HOME}/www/updates/${updatedir}"
-			if [ -e ${src} ]; then
-				REVERTLIST=${REVERTLIST}" ../src/com/dmdirc/config/defaults/${updatedir}/"
-				cp -Rfv ${src}/* ../src/com/dmdirc/config/defaults/${updatedir}/
-			fi;
-		done
-	fi;
-fi;
-
 cd build
 echo "Manifest-Version: 1.0" > manifest.txt
 echo "Created-By: DMDirc Installer" >> manifest.txt
@@ -214,6 +196,24 @@ fi
 cd ${THISDIR}
 rm -Rf installer_temp
 
+# Copy default settings from www to trunk for compile (if they exist, and we are
+# building a new jar)
+REVERTLIST=""
+if [ "" != "${JARFILE}" ]; then
+	if [ -e "${HOME}/www/updates/" ]; then
+		echo "================================================================"
+		echo "Applying settings update to this source"
+		echo "================================================================"
+		for updatedir in `ls -1 ../src/com/dmdirc/config/defaults/`; do
+			src="${HOME}/www/updates/${updatedir}"
+			if [ -e ${src} ]; then
+				REVERTLIST=${REVERTLIST}" ../src/com/dmdirc/config/defaults/${updatedir}/"
+				cp -Rfv ${src}/* ../src/com/dmdirc/config/defaults/${updatedir}/
+			fi;
+		done
+	fi;
+fi;
+
 if [ "" = "${FULLJAR}" ]; then
 	echo "================================================================"
 	echo "Building Release Jar"