|
@@ -1,7 +1,7 @@
|
1
|
1
|
#!/bin/sh
|
2
|
2
|
# This script generates the launcher updates
|
3
|
3
|
LAUNCHERDIR=`dirname $0`
|
4
|
|
-LAUNCHERUPDATEDIR="/home/dmdirc/www/updates/launchers/"
|
|
4
|
+LAUNCHERUPDATEDIR="/tmp/launchers/"
|
5
|
5
|
|
6
|
6
|
UNIXVERSION=`cat ${LAUNCHERDIR}/unix/DMDirc.sh | grep LAUNCHERVERSION= | awk -F\" '{print $2}'`
|
7
|
7
|
WINDOWSVERSION=`cat ${LAUNCHERDIR}/windows/DMDirc.dpr | grep "launcherVersion: String =" | awk -F\' '{print $2}'`
|
|
@@ -23,31 +23,33 @@ else
|
23
|
23
|
fi;
|
24
|
24
|
|
25
|
25
|
if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
|
26
|
|
- /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: unix-${UNIXVERSION}";
|
|
26
|
+echo /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
|
30
|
30
|
DESTFILE=${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh
|
31
|
31
|
|
32
|
32
|
if [ -e "${FUNCTIONSFILE}" ]; then
|
33
|
|
- FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" ${SRCFILE}`
|
|
33
|
+ FUNCTIONSLINE=`grep ${GREPOPTS} "^\s*###FUNCTIONS_FILE###\s*$" ${SRCFILE}`
|
34
|
34
|
if [ "${FUNCTIONSLINE}" == "" ]; then
|
35
|
35
|
cp ${SRCFILE} ${DESTFILE}
|
36
|
36
|
else
|
37
|
37
|
FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
|
38
|
38
|
|
39
|
39
|
head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
|
40
|
|
- cat functions.sh >> ${DESTFILE}
|
|
40
|
+ cat ${FUNCTIONSFILE} >> ${DESTFILE}
|
41
|
41
|
echo "" >> ${DESTFILE}
|
42
|
42
|
tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
|
43
|
43
|
fi;
|
44
|
44
|
else
|
45
|
|
- /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Unable to create unix launcher update, no functions.sh found."
|
|
45
|
+echo /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Unable to create unix launcher update, no functions.sh found."
|
46
|
46
|
fi;
|
47
|
47
|
fi;
|
48
|
48
|
|
|
49
|
+exit 0;
|
|
50
|
+
|
49
|
51
|
if [ ! -e "${LAUNCHERUPDATEDIR}/windows-${WINDOWSVERSION}.zip" ]; then
|
50
|
|
- /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: windows-${WINDOWSVERSION}";
|
|
52
|
+echo /home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: windows-${WINDOWSVERSION}";
|
51
|
53
|
OLDDIR=${PWD}
|
52
|
54
|
cd ${LAUNCHERDIR}/windows
|
53
|
55
|
sh compile.sh
|