From: Art Cancro <ajc@citadel.org>
Date: Mon, 22 Feb 2021 00:29:32 +0000 (-0500)
Subject: appimage updates
X-Git-Tag: v939~108^2~1
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=21d790c0f43069af91366968bac307d8ff7c9cbb

appimage updates
---

diff --git a/appimage/README.txt b/appimage/README.txt
index 4cdcfc459..5443d2a98 100644
--- a/appimage/README.txt
+++ b/appimage/README.txt
@@ -7,8 +7,8 @@ distributed as a single binary file.  Visit https://appimage.org/ to learn more
 AppImage format and how it works.
 
 Again, do NOT try to run this on your production machine.  For that matter, don't try to
-run it on anything other than a dedicated build host.  It will ERASE /usr/local/citadel
-and /usr/local/webcit during the build process.
+run it on anything other than a dedicated build host.  It may ERASE data you intended to
+keep.
 
 If you're an end user you shouldn't have any need to do this at all.  The whole point of
 this is that we can supply ready-to-run binaries that will run on any Linux/Linux system
diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 6df62a4ce..693066094 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -57,12 +57,13 @@ rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1
 
 cpu=`uname -p`
+basefilename=citadel-`date +%s`
 if [ $cpu == x86_64 ] ; then
-	ARCH=x86_64 appimagetool citadel.AppDir/
-	md5sum Citadel-x86_64.AppImage | awk ' { print $1 } ' >Citadel-x86_64.AppImage.md5
+	ARCH=x86_64 appimagetool citadel.AppDir/ ${basefilename}-x64.appimage
+	md5sum ${basefilename}-x64.appimage | awk ' { print $1 } ' >${basefilename}-x64.appimage.md5
 else
-	ARCH=ARM appimagetool citadel.AppDir/
-	md5sum Citadel-armhf.AppImage | awk ' { print $1 } ' >Citadel-armhf.AppImage.md5
+	ARCH=ARM appimagetool ${basefilename}.AppDir/ ${basefilename}-arm32.appimage
+	md5sum ${basefilename}-arm32.appimage | awk ' { print $1 } ' >${basefilename}-arm32.appimage.md5
 fi