From: Art Cancro <ajc@citadel.org>
Date: Tue, 6 Jul 2021 03:48:44 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v939~43
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3ad568a2b76a63f74d6e697ef51abb2c9ae4d28e;hp=-c

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

3ad568a2b76a63f74d6e697ef51abb2c9ae4d28e
diff --combined appimage/build_appimage.sh
index 665d8dd38,c7cd74d42..4fddec1a5
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@@ -92,11 -92,13 +92,13 @@@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD
  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=armhf
+ elif [ $CPU == aarch64 ] ; then
+ 	export ARCH=aarch64
  fi
  echo ARCH: $ARCH
  echo CPU: $CPU