diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-10-04 06:57:19 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-10-04 06:57:19 +0000 |
| commit | e85eba53ac46926107dd4e443ad754cc8ebeee4a (patch) | |
| tree | e91e8c6537f3a4ab67c88b185880d04bd918157b /unix/vncserver | |
| parent | 7636ad0cc4186ec01827696426a03cca914ce57b (diff) | |
| download | tigervnc-e85eba53ac46926107dd4e443ad754cc8ebeee4a.tar.gz tigervnc-e85eba53ac46926107dd4e443ad754cc8ebeee4a.zip | |
Always look for the Java classes in ../vnc/classes first before looking in the system locations. This prevents TigerVNC from picking up the Java classes from a RealVNC installation.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4691 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/vncserver')
| -rwxr-xr-x | unix/vncserver | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/unix/vncserver b/unix/vncserver index 689641f0..3d629ed5 100755 --- a/unix/vncserver +++ b/unix/vncserver @@ -48,9 +48,10 @@ $xauth = "xauth"; $geometry = "1024x768"; #$depth = 16; -$vncJavaFiles = (((-d "/usr/share/vnc/classes") && "/usr/share/vnc/classes") || - ((-d "/usr/local/vnc/classes") && "/usr/local/vnc/classes") || - ((-d "$vncClasses") && "$vncClasses")); +$vncJavaFiles = (((-d "$vncClasses") && "$vncClasses") || + ((-d "/usr/share/vnc/classes") && "/usr/share/vnc/classes") || + ((-d "/usr/local/vnc/classes") && "/usr/local/vnc/classes")); + $vncUserDir = "$ENV{HOME}/.vnc"; $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority"; |