From 4397e5ac9918708106a00cd2bde21c46ece9e191 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 9 Jun 2021 16:29:03 -0400
Subject: [PATCH] remove libz from excludelist

---
 appimage/build_appimage.sh     | 19 ++++++++++++++++++-
 appimage/citadel.AppDir/AppRun |  6 ++++++
 appimage/excludelist           |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index b3ab8ea6e..8680bd711 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
diff --git a/appimage/citadel.AppDir/AppRun b/appimage/citadel.AppDir/AppRun
index 373d71700..70f00b920 100755
--- a/appimage/citadel.AppDir/AppRun
+++ b/appimage/citadel.AppDir/AppRun
@@ -218,6 +218,12 @@ case ${1} in
 		export PATH=$APPDIR/usr/bin:$PATH
 		exec $APPDIR/usr/local/citadel/citserver -x9 -h $CTDL_DIR
 		;;
+	connect)
+		export LD_LIBRARY_PATH=$APPDIR/usr/lib
+		export PATH=$APPDIR/usr/bin:$PATH
+		cd $APPDIR
+		exec citadel $*
+		;;
 	*)
 		echo Unexpected command: ${1} 
 		usage
diff --git a/appimage/excludelist b/appimage/excludelist
index 99ad94307..9ddaa07b2 100644
--- a/appimage/excludelist
+++ b/appimage/excludelist
@@ -1,5 +1,5 @@
 # retrieved from https://raw.githubusercontent.com/AppImage/pkg2appimage/master/excludelist by ajc on 2021may10
-# I also removed libexpat from this list
+# I also removed libexpat and libz from this list
 
 # This file lists libraries that we will assume to be present on the host system and hence
 # should NOT be bundled inside AppImages. This is a working document; expect it to change
@@ -158,7 +158,7 @@ libSM.so.6
 libusb-1.0.so.0
 libuuid.so.1
 # libwind.so.0 # Missing on openSUSE LEAP 42.0
-libz.so.1
+#libz.so.1 removed by ajc 2021jun09
 
 # Potentially dangerous libraries
 libgobject-2.0.so.0
-- 
2.30.2