appimage updates

diff --git a/appimage/README.txt b/appimage/README.txt
index 4cdcfc4591b0ef3226c91a2a5e1d54c10a2f08c4..5443d2a9896ba2e2d44146ffd9b184bed591cb01 100644 (file)
--- 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
 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
 
 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 6df62a4cec403daae84b9b9321dff5060bdca4b8..6930660940e81d800f8264c5ccf8be9d56c2a830 100755 (executable)
--- 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`
 cc ctdlvisor.c -o citadel.AppDir/usr/bin/ctdlvisor || exit 1
 
 cpu=`uname -p`

+basefilename=citadel-`date +%s`

 if [ $cpu == x86_64 ] ; then
 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
 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
 
 
 fi