[hopefully really] fix bundle scripts

pantherb · Jun 12, 2015 · 5b27f66 · 5b27f66
1 parent bfeaf1d
commit 5b27f66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/x-lnx-bundle.sh b/x-lnx-bundle.sh
@@ -47,6 +47,8 @@ if test -z "$OUTDIR"; then
 	OUTDIR=/tmp/
 fi
 
+TOP=`pwd`
+
 ##############################################################################
 
 PRODUCT_NAME=setBfree
@@ -56,6 +58,7 @@ trap "rm -rf ${BUNDLEDIR}" EXIT
 mkdir -p ${BUNDLEDIR}/${PRODUCT_NAME}/bin
 mkdir -p ${BUNDLEDIR}/${PRODUCT_NAME}/b_synth.lv2
 
+cd $TOP
 cp -v b_synth/*.ttl b_synth/*.so "${BUNDLEDIR}/${PRODUCT_NAME}/b_synth.lv2"
 cp -v ui/setBfreeUI "${BUNDLEDIR}/${PRODUCT_NAME}/bin"
 cp -v src/setBfree "${BUNDLEDIR}/${PRODUCT_NAME}/bin"
@@ -85,13 +88,13 @@ rm -rf ${BUNDLEDIR}
 ##############################################################################
 
 PRODUCT_NAME=x42-whirl
-
 BUNDLEDIR=`mktemp -d`
 trap "rm -rf ${BUNDLEDIR}" EXIT
 
 mkdir -p ${BUNDLEDIR}/${PRODUCT_NAME}/bin
 mkdir -p ${BUNDLEDIR}/${PRODUCT_NAME}/b_whirl.lv2
 
+cd $TOP
 cp -v b_whirl/*.ttl b_whirl/*.so "${BUNDLEDIR}/${PRODUCT_NAME}/b_whirl.lv2"
 cp -v b_whirl/x42-whirl "${BUNDLEDIR}/${PRODUCT_NAME}/bin"
 

diff --git a/x-win-bundle.sh b/x-win-bundle.sh
@@ -226,7 +226,7 @@ mkdir -p ${DESTDIR}/b_whirl.lv2
 cp -v b_whirl/*.ttl b_whirl/*.dll "$DESTDIR/$LV2BUNDLE"
 cp -v COPYING "$DESTDIR/share/"
 cp -v b_whirl/x42-whirl.exe "$DESTDIR/"
-cp -v b_whirl/img/x42.ico "$DESTDIR/share/"
+cp -v b_whirl/img/x42.ico "$DESTDIR/share/whirl.ico"
 #cp -v doc/win_readme.txt "${DESTDIR}/README.txt"
 
 echo " === complete"