projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly handle multiple spaces in a row in msgs sent by (faulty?) ircds
[quassel.git]
/
scripts
/
build
/
macosx_makePackage.sh
diff --git
a/scripts/build/macosx_makePackage.sh
b/scripts/build/macosx_makePackage.sh
index
35b4f88
..
b37f3b0
100755
(executable)
--- a/
scripts/build/macosx_makePackage.sh
+++ b/
scripts/build/macosx_makePackage.sh
@@
-43,17
+43,26
@@
fi
SCRIPTDIR=$(dirname $mypath)
QUASSEL_VERSION=$(git-describe)
BUILDTYPE=$1
SCRIPTDIR=$(dirname $mypath)
QUASSEL_VERSION=$(git-describe)
BUILDTYPE=$1
+
+# check the working dir
+WORKINGDIR=$2
+if [[ ! -n $2 ]]; then
+ WORKINGDIR="."
+fi
+WORKINGDIR="${WORKINGDIR}/"
+PACKAGETMPDIR="${WORKINGDIR}PACKAGE_TMP_DIR_${BUILDTYPE}"
if [[ $BUILDTYPE = "Core" ]] || [[ $BUILDTYPE = "Client" ]]; then
QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg"
if [[ $BUILDTYPE = "Core" ]] || [[ $BUILDTYPE = "Client" ]]; then
QUASSEL_DMG="Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg"
- mkdir $
BUILDTYPE
+ mkdir $
PACKAGETMPDIR
if [[ $BUILDTYPE = "Client" ]]; then
if [[ $BUILDTYPE = "Client" ]]; then
- cp -r
Quassel\ Client.app Client
/
- ${SCRIPTDIR}/macosx_DeployApp.py "
Client
/Quassel Client.app"
+ cp -r
${WORKINGDIR}Quassel\ Client.app ${PACKAGETMPDIR}
/
+ ${SCRIPTDIR}/macosx_DeployApp.py "
${PACKAGETMPDIR}
/Quassel Client.app"
else
else
- cp
quasselcore Core
/
- ${SCRIPTDIR}/macosx_DeployApp.py --nobundle
Core
+ cp
${WORKINGDIR}quasselcore ${PACKAGETMPDIR}
/
+ ${SCRIPTDIR}/macosx_DeployApp.py --nobundle
${PACKAGETMPDIR}
fi
fi
- hdiutil create -srcfolder ${BUILDTYPE} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg" >/dev/null
+ hdiutil create -srcfolder ${PACKAGETMPDIR} -format UDBZ -volname "Quassel ${BUILDTYPE} - ${QUASSEL_VERSION}" "${WORKINGDIR}Quassel${BUILDTYPE}_MacOSX-universal_${QUASSEL_VERSION}.dmg" >/dev/null
+ rm -rf ${PACKAGETMPDIR}
else
echo >&2 "Valid parameters are \"Client\" or \"Core\""
fi
else
echo >&2 "Valid parameters are \"Client\" or \"Core\""
fi