From: Richard Jones Date: Sat, 25 Apr 2009 09:38:39 +0000 (+0100) Subject: If LIBGUESTFS_PATH is set, guestfish shouldn't modify the path. X-Git-Tag: 1.0.13~23 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ae17137f643c33f0ad8f61dc1abe4800815ddcc3;p=libguestfs.git If LIBGUESTFS_PATH is set, guestfish shouldn't modify the path. --- diff --git a/fish/fish.c b/fish/fish.c index 1255a2d..812197c 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -136,8 +136,12 @@ main (int argc, char *argv[]) /* If developing, add . to the path. Note that libtools interferes * with this because uninstalled guestfish is a shell script that runs * the real program with an absolute path. Detect that too. + * + * BUT if LIBGUESTFS_PATH environment variable is already set by + * the user, then don't override it. */ - if (argv[0] && + if (getenv ("LIBGUESTFS_PATH") == NULL && + argv[0] && (argv[0][0] != '/' || strstr (argv[0], "/.libs/lt-") != NULL)) guestfs_set_path (g, ".:" GUESTFS_DEFAULT_PATH);