|
@@ -174,24 +174,6 @@ if [ $? -ne 0 ]; then
|
174
|
174
|
exit 1;
|
175
|
175
|
fi
|
176
|
176
|
|
177
|
|
-# Copy default settings from www to trunk for compile (if they exist, and we are
|
178
|
|
-# building a new jar)
|
179
|
|
-REVERTLIST=""
|
180
|
|
-if [ "" != "${JARFILE}" ]; then
|
181
|
|
- if [ -e "${HOME}/www/updates/" ]; then
|
182
|
|
- echo "================================================================"
|
183
|
|
- echo "Applying settings update to this source"
|
184
|
|
- echo "================================================================"
|
185
|
|
- for updatedir in `ls -1 ../src/com/dmdirc/config/defaults/`; do
|
186
|
|
- src="${HOME}/www/updates/${updatedir}"
|
187
|
|
- if [ -e ${src} ]; then
|
188
|
|
- REVERTLIST=${REVERTLIST}" ../src/com/dmdirc/config/defaults/${updatedir}/"
|
189
|
|
- cp -Rfv ${src}/* ../src/com/dmdirc/config/defaults/${updatedir}/
|
190
|
|
- fi;
|
191
|
|
- done
|
192
|
|
- fi;
|
193
|
|
-fi;
|
194
|
|
-
|
195
|
177
|
cd build
|
196
|
178
|
echo "Manifest-Version: 1.0" > manifest.txt
|
197
|
179
|
echo "Created-By: DMDirc Installer" >> manifest.txt
|
|
@@ -214,6 +196,24 @@ fi
|
214
|
196
|
cd ${THISDIR}
|
215
|
197
|
rm -Rf installer_temp
|
216
|
198
|
|
|
199
|
+# Copy default settings from www to trunk for compile (if they exist, and we are
|
|
200
|
+# building a new jar)
|
|
201
|
+REVERTLIST=""
|
|
202
|
+if [ "" != "${JARFILE}" ]; then
|
|
203
|
+ if [ -e "${HOME}/www/updates/" ]; then
|
|
204
|
+ echo "================================================================"
|
|
205
|
+ echo "Applying settings update to this source"
|
|
206
|
+ echo "================================================================"
|
|
207
|
+ for updatedir in `ls -1 ../src/com/dmdirc/config/defaults/`; do
|
|
208
|
+ src="${HOME}/www/updates/${updatedir}"
|
|
209
|
+ if [ -e ${src} ]; then
|
|
210
|
+ REVERTLIST=${REVERTLIST}" ../src/com/dmdirc/config/defaults/${updatedir}/"
|
|
211
|
+ cp -Rfv ${src}/* ../src/com/dmdirc/config/defaults/${updatedir}/
|
|
212
|
+ fi;
|
|
213
|
+ done
|
|
214
|
+ fi;
|
|
215
|
+fi;
|
|
216
|
+
|
217
|
217
|
if [ "" = "${FULLJAR}" ]; then
|
218
|
218
|
echo "================================================================"
|
219
|
219
|
echo "Building Release Jar"
|