fixed a bug with ctdlmigrate running in appimage

diff --git a/appimage/citadel.AppDir/AppRun b/appimage/citadel.AppDir/AppRun
index 0390ad2cd99477cead8177621931fefc0f857149..373d717003cdfdc6bbd15a03edb2bb4c293df549 100755 (executable)
--- a/appimage/citadel.AppDir/AppRun
+++ b/appimage/citadel.AppDir/AppRun
@@ -203,7 +203,7 @@ case ${1} in
                export APPDIR CTDL_DIR HTTP_PORT HTTPS_PORT
                export LD_LIBRARY_PATH=$APPDIR/usr/lib
                export PATH=$APPDIR/usr/bin
-               exec ctdlvisor -m -h $CTDL_DIR
+               exec ctdlvisor -m
                ;;
        mount)
                echo This mode of operation mounts the AppImage but does not run anything.

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index 6784f2cc5d042998ca55eb2f8068dcbca87be656..3c7be88cc514159689e7012f2e8cccf4d2f65470 100644 (file)
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -4,16 +4,9 @@
 //
 // Copyright (c) 2021 by the citadel.org team
 //
-// This program is open source software.  It runs great on the
-// Linux operating system (and probably elsewhere).  You can use,
-// copy, and run it under the terms of the GNU General Public
-// License version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
+// The program is distributed without any warranty, expressed or implied.
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -244,7 +237,7 @@ int main(int argc, char **argv) {
                fprintf(stderr, "ctdlvisor: waiting a moment for citserver to initialize...\n");
                sleep(5);
                char bin[1024];
-               sprintf(bin, "%s/usr/local/citadel/ctdlmigrate", getenv("APPDIR"));
+               sprintf(bin, "%s/usr/local/citadel/ctdlmigrate -h %s", getenv("APPDIR"), getenv("CTDL_DIR"));
                system(bin);
                kill(citserver_pid, SIGTERM);
        }