diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-12-29 14:24:55 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-12-29 14:24:55 +0100 |
| commit | a7ac6a9534b1e7af98c4647cc9915e5d1b02d0c4 (patch) | |
| tree | 31c5a3d84b1cad78bf20b59e611c554c24bf6cd0 /unix | |
| parent | 10d9af57ca4bbce72cca4d21b8a609a4611da024 (diff) | |
| download | tigervnc-a7ac6a9534b1e7af98c4647cc9915e5d1b02d0c4.tar.gz tigervnc-a7ac6a9534b1e7af98c4647cc9915e5d1b02d0c4.zip | |
Check that xauth is in PATH
The rest of the code assumes xauth is in PATH, so let's check for
that instead.
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/vncserver | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/unix/vncserver b/unix/vncserver index c4d05359..a4d6ad93 100755 --- a/unix/vncserver +++ b/unix/vncserver @@ -38,8 +38,6 @@ if($slashndx>=0) { $vncClasses = ""; -$xauth = "xauth"; - &SanityCheck(); # @@ -793,7 +791,7 @@ sub SanityCheck # cmd: - foreach $cmd ("uname") { + foreach $cmd ("uname","xauth") { for (split(/:/,$ENV{PATH})) { if (-x "$_/$cmd") { next cmd; @@ -801,20 +799,6 @@ sub SanityCheck } die "$prog: couldn't find \"$cmd\" on your PATH.\n"; } - if (-x "/usr/X11R6/bin/xauth") { - $xauth = "/usr/X11R6/bin/xauth"; - } - else { - cmd1: - foreach $cmd ("xauth") { - for (split(/:/,$ENV{PATH})) { - if (-x "$_/$cmd") { - next cmd1; - } - } - die "$prog: couldn't find \"$cmd\" on your PATH.\n"; - } - } if($exedir eq "") { cmd2: |