arrgh

[citadel.git] / appimage / build_appimage.sh

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index eec8335b0e553a691c14e0c71da987b72ae1e240..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
@@ -65,12 +68,13 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 
 cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 21
 
-cpu=`uname -p`
+CPU=`uname -m`
 basefilename=citadel-`date +%s`
-if [ $cpu == x86_64 ] ; then
-       ARCH=x86_64 appimagetool citadel.AppDir/ ${basefilename}-x64.appimage
-else
-       ARCH=ARM appimagetool citadel.AppDir/ ${basefilename}-arm32.appimage
+if [ $CPU == x86_64 ] ; then
+       export ARCH=x86_64
+elif [ $CPU == armv7l ] ; then
+       export ARCH=ARM
 fi
-
-
+echo ARCH: $ARCH
+echo CPU: $CPU
+appimagetool citadel.AppDir/ ${basefilename}-${CPU}.appimage