began making the client AppImage-aware

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 4fddec1a54083bd3769255e4acdddeafb41685db..db3f6b30b3e2de61370b7d9e052ae75187a82127 100755 (executable)
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -1,10 +1,15 @@
 #!/bin/bash
 
+# Work from the directory this script is in
+APPIMAGE_BUILD_DIR=$(dirname $(readlink -f $0))
+cd $APPIMAGE_BUILD_DIR || exit 28
+echo APPIMAGE_BUILD_DIR is `pwd`
+
+# Remove old versions
 rm -vf citadel-*appimage
 
 export CITADEL_BUILD_DIR=/tmp/citadel-build-$$
 export WEBCIT_BUILD_DIR=/tmp/webcit-build-$$
-rm -fr $CITADEL_BUILD_DIR $WEBCIT_BUILD_DIR
 
 # libcitadel has to be built in a "real" library directory
 pushd ../libcitadel || exit 1

diff --git a/textclient/commands.c b/textclient/commands.c
index cecbb4d1fa5d073e3263848785db50d243afee46..81fef751a9bc017b1b6c4c499292f6df9ebe6e7d 100644 (file)
--- a/textclient/commands.c
+++ b/textclient/commands.c
@@ -932,6 +932,10 @@ void load_command_set(void)
                snprintf(buf, sizeof buf, "%s/.citadelrc", getenv("HOME"));
                ccfile = fopen(buf, "r");
        }
+       if (getenv("APPDIR") != NULL) {
+               snprintf(buf, sizeof buf, "%s/citadel.rc", getenv("APPDIR"));
+               ccfile = fopen(buf, "r");
+       }
        if (ccfile == NULL) {
                ccfile = fopen(file_citadel_rc, "r");
        }