|
@@ -23,7 +23,7 @@ else
|
23
|
23
|
fi;
|
24
|
24
|
|
25
|
25
|
if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
|
26
|
|
- echo "Creating Launcher Update: unix-${UNIXVERSION}";
|
|
26
|
+ /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: unix-${UNIXVERSION}";
|
27
|
27
|
|
28
|
28
|
FUNCTIONSFILE="${LAUNCHERDIR}/../installer/linux/functions.sh"
|
29
|
29
|
SRCFILE=${LAUNCHERDIR}/unix/DMDirc.sh
|
|
@@ -32,10 +32,8 @@ if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
|
32
|
32
|
if [ -e "${FUNCTIONSFILE}" ]; then
|
33
|
33
|
FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" ${SRCFILE}`
|
34
|
34
|
if [ "${FUNCTIONSLINE}" == "" ]; then
|
35
|
|
- echo " Functions already built into launcher."
|
36
|
35
|
cp ${SRCFILE} ${DESTFILE}
|
37
|
36
|
else
|
38
|
|
- echo " Including functions.sh into launcher."
|
39
|
37
|
FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
|
40
|
38
|
|
41
|
39
|
head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
|
|
@@ -44,12 +42,12 @@ if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
|
44
|
42
|
tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
|
45
|
43
|
fi;
|
46
|
44
|
else
|
47
|
|
- echo " Unable to create unix launcher update, no functions.sh found."
|
|
45
|
+ /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Unable to create unix launcher update, no functions.sh found."
|
48
|
46
|
fi;
|
49
|
47
|
fi;
|
50
|
48
|
|
51
|
49
|
if [ ! -e "${LAUNCHERUPDATEDIR}/windows-${WINDOWSVERSION}.zip" ]; then
|
52
|
|
- echo "Creating Launcher Update: windows-${WINDOWSVERSION}";
|
|
50
|
+ /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: windows-${WINDOWSVERSION}";
|
53
|
51
|
OLDDIR=${PWD}
|
54
|
52
|
cd ${LAUNCHERDIR}/windows
|
55
|
53
|
sh compile.sh
|
|
@@ -67,4 +65,4 @@ if [ ! -e "${LAUNCHERUPDATEDIR}/windows-${WINDOWSVERSION}.zip" ]; then
|
67
|
65
|
done;
|
68
|
66
|
|
69
|
67
|
cd ${OLDDIR}
|
70
|
|
-fi;
|
|
68
|
+fi;
|