appimage filename now uses ../release_version.txt instead of the timestamp

[citadel.git] / appimage / ctdlvisor.c

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index c7a073a708d0f5e80f2d89aa5240c778784eb3e2..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>
@@ -96,14 +89,12 @@ void detach_from_tty(void) {
 
 pid_t start_citadel() {
        char bin[1024];
-       char backtrace_filename[PATH_MAX];
        sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR"));
        pid_t pid = fork();
        if (pid == 0) {
                fprintf(stderr, "ctdlvisor: executing %s with data directory %s\n", bin, getenv("CTDL_DIR"));
                detach_from_tty();
-               sprintf(backtrace_filename, "/tmp/citserver-backtrace.%d", getpid());
-               execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), "-b", backtrace_filename, NULL);
+               execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), NULL);
                exit(errno);
        }
        else {
@@ -246,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);
        }