X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=appimage%2Fbuild_appimage.sh;h=c7cd74d42d62c497b9c680a1e23253d13286b8a3;hb=07a9d31133354277dc5f9dbf642aa1040a7da76f;hp=b3ab8ea6e2fd3b591caa76446f993252da183b2d;hpb=086b81cf5feff29d057afbb4353210eca71edac2;p=citadel.git

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index b3ab8ea6e..c7cd74d42 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -15,6 +15,14 @@ make || exit 4
 make install || exit 5
 popd
 
+# Build the text mode client
+pushd ../textclient || exit 22
+make distclean 2>/dev/null
+./bootstrap || exit 23
+./configure --prefix=`pwd` || exit 24
+make || exit 25
+popd
+
 # Build the Citadel server
 pushd ../citadel || exit 6
 make distclean 2>/dev/null
@@ -39,7 +47,12 @@ mkdir -p citadel.AppDir/usr/bin
 mkdir -p citadel.AppDir/usr/lib
 
 # Copy over all the libraries we used
-for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate `which gdb`
+for bin in \
+	$CITADEL_BUILD_DIR/citserver \
+	$WEBCIT_BUILD_DIR/webcit \
+	$CITADEL_BUILD_DIR/ctdlmigrate \
+	../textclient/citadel \
+	`which gdb`
 do
 	ldd $bin
 done | sort | while read libname junk libpath
@@ -61,6 +74,10 @@ do
 	cp `which $bin` citadel.AppDir/usr/bin/	|| exit 16
 done
 
+# Copy over the client
+cp ../textclient/citadel citadel.AppDir/usr/bin/ || exit 26
+cp ../textclient/citadel.rc citadel.AppDir/ || exit 27
+
 # Install the Citadel Server application tree
 mkdir -p citadel.AppDir/usr/local/citadel || exit 17
 rsync -va $CITADEL_BUILD_DIR/ ./citadel.AppDir/usr/local/citadel/ || exit 18
@@ -79,7 +96,9 @@ basefilename=citadel-`date +%s`
 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