ARCH needs to be set to 'arm' for 32-bit

[citadel.git] / appimage / build_appimage.sh

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 8680bd711541cfa0036d0784395a4a90774dc330..1a07c7c6a98298af8cc3655e9a9238a2fb134daa 100755 (executable)
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,10 +1,15 @@
 #!/bin/bash
 
+# Work from the directory this script is in
+APPIMAGE_BUILD_DIR=$(dirname $(readlink -f $0))
+cd $APPIMAGE_BUILD_DIR || exit 28
+echo APPIMAGE_BUILD_DIR is `pwd`
+
+# Remove old versions
 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
 
 # libcitadel has to be built in a "real" library directory
 pushd ../libcitadel || exit 1
@@ -92,11 +97,13 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 21
 
 CPU=`uname -m`
-basefilename=citadel-`date +%s`
+basefilename=citadel-`cat ../release_version.txt`
 if [ $CPU == x86_64 ] ; then
        export ARCH=x86_64
 elif [ $CPU == armv7l ] ; then
-       export ARCH=ARM
+       export ARCH=arm
+elif [ $CPU == aarch64 ] ; then
+       export ARCH=aarch64
 fi
 echo ARCH: $ARCH
 echo CPU: $CPU