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

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index c7cd74d42d62c497b9c680a1e23253d13286b8a3..4fddec1a54083bd3769255e4acdddeafb41685db 100755 (executable)
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -92,7 +92,7 @@ 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