|
@@ -70,6 +70,22 @@ return;
|
70
|
70
|
fi
|
71
|
71
|
}
|
72
|
72
|
|
|
73
|
+WGET=`which wget`
|
|
74
|
+FETCH=`which fetch`
|
|
75
|
+CURL=`which curl`
|
|
76
|
+getFile() {
|
|
77
|
+ URL=${1}
|
|
78
|
+ OUTPUT=${2}
|
|
79
|
+
|
|
80
|
+ if [ "${WGET}" != "" ]; then
|
|
81
|
+ ${WGET} -O ${OUTPUT} ${URL}
|
|
82
|
+ elif [ "${FETCH}" != "" ]; then
|
|
83
|
+ ${FETCH} -o ${OUTPUT} ${URL}
|
|
84
|
+ elif [ "${CURL}" != "" ]; then
|
|
85
|
+ ${CURL} -o ${OUTPUT} ${URL}
|
|
86
|
+ fi;
|
|
87
|
+}
|
|
88
|
+
|
73
|
89
|
# Check for some CLI params
|
74
|
90
|
compileJar="false"
|
75
|
91
|
updateSVN="true"
|
|
@@ -79,7 +95,7 @@ isRelease=""
|
79
|
95
|
useUPX="false"
|
80
|
96
|
finalTag=""
|
81
|
97
|
signEXE="true"
|
82
|
|
-compilerFlags=""
|
|
98
|
+compilerFlags="-Xs -XX -O2 -Or -Op1"
|
83
|
99
|
BRANCH="0"
|
84
|
100
|
plugins=""
|
85
|
101
|
location="../../../"
|
|
@@ -378,13 +394,17 @@ FILES="${FILES} DMDirc.jar Setup.exe";
|
378
|
394
|
if [ "" != "${jre}" ]; then
|
379
|
395
|
if [ ! -e "../common/${jrename}.exe" ]; then
|
380
|
396
|
echo "Downloading JRE to include in installer"
|
381
|
|
- wget ${jre} -O ../common/${jrename}.exe
|
|
397
|
+ getFile "${jre}" "../common/${jrename}.exe"
|
382
|
398
|
fi
|
383
|
399
|
ln -sf ../common/${jrename}.exe jre.exe
|
384
|
400
|
FILES="${FILES} jre.exe"
|
385
|
401
|
fi;
|
386
|
402
|
DELETEFILES=${FILES}
|
387
|
|
-FPC=`which fpc`
|
|
403
|
+if [ "" != "${DMDIRC_FPC}" ]; then
|
|
404
|
+ FPC=${DMDIRC_FPC}
|
|
405
|
+else
|
|
406
|
+ FPC=`which fpc`
|
|
407
|
+fi;
|
388
|
408
|
lazarusDir="/usr/share/lazarus"
|
389
|
409
|
if [ ! -e "${lazarusDir}/lcl" ]; then
|
390
|
410
|
lazarusDir="/usr/lib/lazarus/"
|
|
@@ -431,7 +451,7 @@ echo "Compressing files.."
|
431
|
451
|
|
432
|
452
|
# Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
|
433
|
453
|
if [ ! -e Shortcut.exe ]; then
|
434
|
|
- wget http://binary.dmdirc.com/Shortcut.zip
|
|
454
|
+ getFile "http://binary.dmdirc.com/Shortcut.zip" "Shortcut.zip"
|
435
|
455
|
unzip -q Shortcut.zip Shortcut.exe
|
436
|
456
|
rm Shortcut.zip
|
437
|
457
|
fi
|
|
@@ -481,7 +501,7 @@ fi
|
481
|
501
|
|
482
|
502
|
# Add wget to allow downloading jre
|
483
|
503
|
if [ ! -e "wget.exe" ]; then
|
484
|
|
- wget http://binary.dmdirc.com/wget.exe
|
|
504
|
+ getFile "http://binary.dmdirc.com/wget.exe" "wget.exe"
|
485
|
505
|
fi;
|
486
|
506
|
|
487
|
507
|
if [ ! -e "wget.exe" ]; then
|
|
@@ -507,7 +527,7 @@ echo ";!@InstallEnd@!" >> 7zip.conf
|
507
|
527
|
|
508
|
528
|
if [ ! -e "7zS.sfx" ]; then
|
509
|
529
|
echo "Obtaining sfx stub.."
|
510
|
|
- wget http://binary.dmdirc.com/7zS.sfx
|
|
530
|
+ getFile "http://binary.dmdirc.com/7zS.sfx" "7zS.sfx"
|
511
|
531
|
fi
|
512
|
532
|
|
513
|
533
|
if [ ! -e "7zS.sfx" ]; then
|