2017-04-26 13:27:46 +00:00
|
|
|
--- a/AppRun.c
|
|
|
|
+++ b/AppRun.c
|
2018-01-06 22:38:46 +00:00
|
|
|
@@ -164,6 +164,10 @@
|
2017-12-21 15:40:15 +00:00
|
|
|
char *old_env;
|
|
|
|
size_t length;
|
|
|
|
const char *format;
|
|
|
|
+ checkrt(usr_in_appdir);
|
2017-12-06 13:37:47 +00:00
|
|
|
+
|
|
|
|
+ if (optional_ld_preload)
|
|
|
|
+ putenv(optional_ld_preload);
|
2017-04-26 13:27:46 +00:00
|
|
|
|
2017-12-21 15:40:15 +00:00
|
|
|
/* https://docs.python.org/2/using/cmdline.html#envvar-PYTHONHOME */
|
|
|
|
SET_NEW_ENV(new_pythonhome, appdir_s, "PYTHONHOME=%s/usr/", appdir);
|
2018-01-06 22:38:46 +00:00
|
|
|
@@ -172,7 +176,7 @@
|
|
|
|
SET_NEW_ENV(new_path, appdir_s*5 + strlen(old_env), "PATH=%s/usr/bin/:%s/usr/sbin/:%s/usr/games/:%s/bin/:%s/sbin/:%s", appdir, appdir, appdir, appdir, appdir, old_env);
|
2017-12-21 15:40:15 +00:00
|
|
|
|
|
|
|
old_env = getenv("LD_LIBRARY_PATH") ?: "";
|
2018-01-06 22:38:46 +00:00
|
|
|
- SET_NEW_ENV(new_ld_library_path, appdir_s*10 + strlen(old_env), "LD_LIBRARY_PATH=%s/usr/lib/:%s/usr/lib/i386-linux-gnu/:%s/usr/lib/x86_64-linux-gnu/:%s/usr/lib32/:%s/usr/lib64/:%s/lib/:%s/lib/i386-linux-gnu/:%s/lib/x86_64-linux-gnu/:%s/lib32/:%s/lib64/:%s", appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, old_env);
|
|
|
|
+ SET_NEW_ENV(new_ld_library_path, appdir_s*10 + strlen(old_env), "LD_LIBRARY_PATH=%s%s/usr/lib/:%s/usr/lib/i386-linux-gnu/:%s/usr/lib/x86_64-linux-gnu/:%s/usr/lib32/:%s/usr/lib64/:%s/lib/:%s/lib/i386-linux-gnu/:%s/lib/x86_64-linux-gnu/:%s/lib32/:%s/lib64/:%s", optional_ld_library_path, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, appdir, old_env);
|
|
|
|
|
|
|
|
old_env = getenv("PYTHONPATH") ?: "";
|
|
|
|
SET_NEW_ENV(new_pythonpath, appdir_s + strlen(old_env), "PYTHONPATH=%s/usr/share/pyshared/:%s", appdir, old_env);
|
2017-12-21 15:40:15 +00:00
|
|
|
@@ -201,6 +205,9 @@
|
|
|
|
if (ret == -1)
|
|
|
|
die("Error executing '%s': %s\n", exe, strerror(error));
|
2018-01-06 22:38:46 +00:00
|
|
|
|
|
|
|
+ free(optional_ld_library_path);
|
2017-12-06 13:37:47 +00:00
|
|
|
+ if (optional_ld_preload)
|
|
|
|
+ free(optional_ld_preload);
|
2017-12-21 15:40:15 +00:00
|
|
|
free(line);
|
|
|
|
free(desktop_file);
|
|
|
|
free(usr_in_appdir);
|