From: Art Cancro <ajc@citadel.org>
Date: Fri, 16 Jul 2021 21:03:55 +0000 (-0400)
Subject: cleanup
X-Git-Tag: v939~41^2~2
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=a5b89af01e00b8e95937ac60502cff4a34a710de

cleanup
---

diff --git a/appimage/README.txt b/appimage/README.txt
index ec9369577..a2949fb36 100644
--- a/appimage/README.txt
+++ b/appimage/README.txt
@@ -6,9 +6,9 @@ The tooling in this directory can be used to build an AppImage, the entire Citad
 distributed as a single binary file.  Visit https://appimage.org/ to learn more about the
 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 may ERASE data you intended to
-keep.
+Again, do NOT try to build this on your production machine.  For that matter, don't try
+to build 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
diff --git a/appimage/citadel.AppDir/AppRun b/appimage/citadel.AppDir/AppRun
index 079a2a0af..860b36b37 100755
--- a/appimage/citadel.AppDir/AppRun
+++ b/appimage/citadel.AppDir/AppRun
@@ -23,7 +23,7 @@ ulimit -c unlimited
 
 usage() {
 	echo ${APPIMAGE}: usage: ${APPIMAGE} '[-h data_directory] [-p http_port] [-s https_port] command'
-	echo 'command must be one of: run, test, install, client, database_cleanup, migrate'
+	echo 'command must be one of: run, test, install, database_cleanup, migrate'
 	exit 2
 }
 
@@ -182,7 +182,7 @@ installation() {
 	echo -e '\033[44m\033[37m \033[K\033[0m'
 	echo
 
-	echo Installation has completed.
+	echo -e '\033[32m\033[1mInstallation has completed.\033[0m'
 	echo Please continue by browsing to http://`hostname`:${HTTP_PORT}
 	echo
 	echo -e 'If this is a new installation, the default administrator'
@@ -225,9 +225,6 @@ case ${1} in
 	install)
 		installation
 		;;
-	client)
-		exec $APPDIR/usr/bin/citadel
-		;;
 	database_cleanup)
 		export LD_LIBRARY_PATH=$APPDIR/usr/lib
 		export PATH=$APPDIR/usr/bin:$PATH
@@ -252,12 +249,6 @@ 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