Added -b UNIQUEID to both .desktop and to pnd_app_exec() -- why don't these two thing...

Added /usr/bin/nohup to .desktop
Need to figure out when to use -x to pnd_run to kill X11

diff --git a/lib/pnd_apps.c b/lib/pnd_apps.c
index 4a2cf94665239dae3e787c155439062d95e54a71..d2d2ce6e947f546a62da99b19f57f7d7eccbb90e 100644 (file)
--- a/lib/pnd_apps.c
+++ b/lib/pnd_apps.c
@@ -57,10 +57,10 @@ unsigned char pnd_apps_exec ( char *pndrun, char *fullpath, char *unique_id,
     argv [ f++ ] = "-s";
     argv [ f++ ] = rel_startdir;
   }
-  // skip -a (arguments) for now
+  argv [ f++ ] = "-b";
+  argv [ f++ ] = unique_id;
 
-  //argv [ f++ ] = "-b";
-  //argv [ f++ ] = baename;
+  // skip -a (arguments) for now
 
   if ( options & PND_EXEC_OPTION_NOUNION ) {
     argv [ f++ ] = "-n"; // no union for now

diff --git a/lib/pnd_desktop.c b/lib/pnd_desktop.c
index 08686299d42351fe3601e6cf577f11eab7f1451d..0c91c7408c8d681945f7e5740b96b9c77de5113f 100644 (file)
--- a/lib/pnd_desktop.c
+++ b/lib/pnd_desktop.c
@@ -84,9 +84,11 @@ unsigned char pnd_emit_dotdesktop ( char *targetpath, char *pndrun, pnd_disco_t
 
     // basics
     if ( p -> object_type == pnd_object_type_directory ) {
-      snprintf ( buffer, 1020, "Exec=%s -p %s -e %s -n", pndrun, p -> object_path, p -> exec );
+      snprintf ( buffer, 1020, "Exec=/usr/bin/nohup %s -p %s -e %s -b %s -n",
+                pndrun, p -> object_path, p -> exec, p -> unique_id );
     } else if ( p -> object_type == pnd_object_type_pnd ) {
-      snprintf ( buffer, 1020, "Exec=%s -p %s/%s -e %s -n", pndrun, p -> object_path, p -> object_filename, p -> exec );
+      snprintf ( buffer, 1020, "Exec=/usr/bin/nohup %s -p %s/%s -e %s -b %s -n",
+                pndrun, p -> object_path, p -> object_filename, p -> exec, p -> unique_id );
     }
 
     // start dir

diff --git a/testdata/pndsample/x86_echo.pnd b/testdata/pndsample/x86_echo.pnd
index d3891db1497566be4d85424230ce2c80932d45c3..1bddde2ccaad9b0643d9a8b52c6854621f7fa9f3 100644 (file)
Binary files a/testdata/pndsample/x86_echo.pnd and b/testdata/pndsample/x86_echo.pnd differ

diff --git a/testdata/pndsample/x86_ls.pnd b/testdata/pndsample/x86_ls.pnd
index 1cc6c85866065dffc420aa5b29174111f9501aef..db323e14d4a1ad8d9b1345a4016a2bba5a9aa05d 100644 (file)
Binary files a/testdata/pndsample/x86_ls.pnd and b/testdata/pndsample/x86_ls.pnd differ