diff options
| author | Richard Jones <rjones@redhat.com> | 2009-04-25 10:38:39 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-04-25 10:38:39 +0100 |
| commit | ae17137f643c33f0ad8f61dc1abe4800815ddcc3 (patch) | |
| tree | 331fb21a487cd864d21e2af77960d8d766446e4a /fish | |
| parent | 2b21eec8d423d15c97227567834ce978f8cae42c (diff) | |
| download | libguestfs-ae17137f643c33f0ad8f61dc1abe4800815ddcc3.tar.gz libguestfs-ae17137f643c33f0ad8f61dc1abe4800815ddcc3.tar.xz libguestfs-ae17137f643c33f0ad8f61dc1abe4800815ddcc3.zip | |
If LIBGUESTFS_PATH is set, guestfish shouldn't modify the path.
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/fish.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fish/fish.c b/fish/fish.c index 1255a2d0..812197c5 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); |