--- nxloadconfig.orig Mon Jan 22 19:22:50 2007 +++ nxloadconfig @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/local/bin/bash # # Copyright (c) 2005 by Fabian Franz # (c) 2005 by Jon Severinsson @@ -56,12 +56,12 @@ NX_LICENSE="OS (GPL)" # Where can different nx components be found -NX_DIR=/usr +NX_DIR=/usr/NX PATH_BIN=$NX_DIR/bin # if you change that, be sure to also change the public keys PATH_LIB=$NX_DIR/lib -NX_ETC_DIR=/etc/nxserver -NX_SESS_DIR=/var/lib/nxserver/db -NX_HOME_DIR=/var/lib/nxserver/home +NX_ETC_DIR=$NX_DIR/etc +NX_SESS_DIR=$NX_DIR/var/db +NX_HOME_DIR=$NX_DIR/home/nx # Advanced users ONLY AGENT_LIBRARY_PATH="" #Calculated @@ -144,7 +144,7 @@ ENABLE_KDE_CUPS="0" KDE_PRINTRC="" # Calculated -CUPS_ETC="/etc/cups/" +CUPS_ETC="/usr/local/etc/cups/" # Path directives @@ -162,16 +162,16 @@ COMMAND_XAUTH=/usr/X11R6/bin/xauth COMMAND_SMBMOUNT=smbmount COMMAND_SMBUMOUNT=smbumount -COMMAND_NETCAT=netcat +COMMAND_NETCAT=nc COMMAND_SSH=ssh COMMAND_SSH_KEYGEN=ssh-keygen -COMMAND_CUPSD=/usr/sbin/cupsd -COMMAND_MD5SUM=md5sum +COMMAND_CUPSD=/usr/local/sbin/cupsd +COMMAND_MD5SUM=md5 # Misc directives -ENABLE_2_0_0_BACKEND="" +ENABLE_2_0_0_BACKEND="1" ENABLE_AUTORECONNECT="0" ENABLE_AUTORECONNECT_BEFORE_140="1" EXPORT_USERIP="0" @@ -263,7 +263,7 @@ [ -z "$AGENT_LIBRARY_PATH" ] && AGENT_LIBRARY_PATH=$PATH_LIB [ -z "$PROXY_LIBRARY_PATH" ] && PROXY_LIBRARY_PATH=$PATH_LIB [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB -[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so.1:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" +[ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" if [ -z "$ENABLE_2_0_0_BACKEND" ] then ENABLE_2_0_0_BACKEND="1"