arrgh

[citadel.git] / appimage / build_appimage.sh

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index a611775bed1fbb51bcb3433b1fecef77a2a87db9..b52ee9a28920773683e21a3fe1eebe953f60f56f 100755 (executable)
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+rm -vf citadel-*appimage
+
 export CITADEL_BUILD_DIR=/tmp/citadel-build-$$
 export WEBCIT_BUILD_DIR=/tmp/webcit-build-$$
 rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
@@ -37,9 +39,10 @@ mkdir -p citadel.AppDir/usr/bin
 mkdir -p citadel.AppDir/usr/lib
 
 # Copy over all the libraries we used
-for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit
+for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate
 do
-       for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
+       #for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
+       for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' `
        do
                cp -v -L $x citadel.AppDir/usr/lib/
        done
@@ -69,7 +72,7 @@ CPU=`uname -m`
 basefilename=citadel-`date +%s`
 if [ $CPU == x86_64 ] ; then
        export ARCH=x86_64
-else
+elif [ $CPU == armv7l ] ; then
        export ARCH=ARM
 fi
 echo ARCH: $ARCH