From: Art Cancro <ajc@citadel.org>
Date: Sat, 8 May 2021 23:19:16 +0000 (-0400)
Subject: ZZMerge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v939~58
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=35837c94bf87af75c35e8ceb1f1c55cc967e21aa;hp=61821d8de88d86558bd0fde7138952bfb538e466

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

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index b52ee9a28..8613f4a21 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -39,7 +39,7 @@ 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
+for bin in $CITADEL_BUILD_DIR/citserver $WEBCIT_BUILD_DIR/webcit $CITADEL_BUILD_DIR/ctdlmigrate `which gdb`
 do
 	#for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' | grep -v 'libc.so' | grep -v 'libpthread.so' | grep -v 'libresolv.so'`
 	for x in `ldd $bin | awk ' { print $3 } ' | grep -v -e '^$' `
@@ -50,7 +50,7 @@ done
 ldconfig -v citadel.AppDir/usr/lib
 
 # Copy over some utilities
-for bin in db_dump db_load db_recover
+for bin in db_dump db_load db_recover gdb
 do
 	cp `which $bin` citadel.AppDir/usr/bin/	|| exit 16
 done
diff --git a/appimage/citadel.AppDir/AppRun b/appimage/citadel.AppDir/AppRun
index e498fe428..9c17f828d 100755
--- a/appimage/citadel.AppDir/AppRun
+++ b/appimage/citadel.AppDir/AppRun
@@ -205,6 +205,21 @@ case ${1} in
 		export PATH=$APPDIR/usr/bin
 		exec ctdlvisor -m -h $CTDL_DIR
 		;;
+	mount)
+		echo This mode of operation mounts the AppImage but does not run anything.
+		echo -n Kill it when you are finished...
+		while true
+		do
+			sleep 1
+		done
+		;;
+	debug)
+		echo Connecting to the debugger
+		echo Try this: run -x9 -h $CTDL_DIR
+		export LD_LIBRARY_PATH=$APPDIR/usr/lib
+		export PATH=$APPDIR/usr/bin:$PATH
+		exec $APPDIR/usr/bin/gdb $APPDIR/usr/local/citadel/citserver
+		;;
 	*)
 		echo Unexpected command: ${1} 
 		usage