Attachment #596 for bug #5411

View | Details | Raw Unified | Return to bug 5411
Collapse All | Expand All

Lines 8-13 Link Here

(-)tl-dbus-launch.sh.orig (-1 / +1 lines)
8	#	8	#
9		9
10	# Start DBUS, if not already started	10	# Start DBUS, if not already started
11	if type dbus-launch && test -z "${DBUS_SESSION_BUS_ADDRESS}" ; then	11	if type dbus-launch && test -z ${DBUS_SESSION_BUS_ADDRESS+x} ; then
12	eval `dbus-launch --sh-syntax --exit-with-session`	12	eval `dbus-launch --sh-syntax --exit-with-session`
13	fi	13	fi

Lines 6-12 Link Here

(-)tl-homecreatefilter.sh.orig (-1 / +1 lines)
6		6
7	ID=`id -u`	7	ID=`id -u`
8		8
9	if [ -z "${TLPREFIX}" ]; then	9	if [ -z ${TLPREFIX+x} ]; then
10	echo "Cannot work without TLPREFIX. Exiting."	10	echo "Cannot work without TLPREFIX. Exiting."
11	elif [ "${ID}" -eq 0 ] ; then	11	elif [ "${ID}" -eq 0 ] ; then
12	echo "Root user detected - skipping homecreatefilter"	12	echo "Root user detected - skipping homecreatefilter"

Lines 8-14 Link Here

(-)tl-kinit.sh.orig (-1 / +1 lines)
8	#	8	#
9		9
10	if type kinit; then	10	if type kinit; then
11	if [ -z "${KRB5CCNAME}" ]; then	11	if [ -z ${KRB5CCNAME+x} ]; then
12	export KRB5CCNAME="${TLSESSIONDATA}/krb5cc"	12	export KRB5CCNAME="${TLSESSIONDATA}/krb5cc"
13	fi	13	fi
14	# -l without argument gives usage with both MIT and Heimdal	14	# -l without argument gives usage with both MIT and Heimdal

Lines 7-13 Link Here

(-)tl-lp-redir-launch.orig (-1 / +1 lines)
7	# action: Setting up printer port redirection	7	# action: Setting up printer port redirection
8	#	8	#
9		9
10	if [ -z "${TLPREFIX}" ]; then	10	if [ -z ${TLPREFIX+x} ]; then
11	echo "Cannot work without TLPREFIX. Exiting."	11	echo "Cannot work without TLPREFIX. Exiting."
12	else	12	else
13	"${TLPREFIX}/bin/tl-while-x11" "${TLPREFIX}/libexec/tl-lp-redir" "${TLSESSIONDATA}/dev/lp0" thinlocal &	13	"${TLPREFIX}/bin/tl-while-x11" "${TLPREFIX}/libexec/tl-lp-redir" "${TLSESSIONDATA}/dev/lp0" thinlocal &

Lines 4-10 Link Here

(-)tl-run-xlogout.d.orig (-1 / +1 lines)
4	# Copyright 2002-2014 Cendio AB.	4	# Copyright 2002-2014 Cendio AB.
5	# For more information, see http://www.cendio.com	5	# For more information, see http://www.cendio.com
6		6
7	if [ -z "${TLPREFIX}" ]; then	7	if [ -z ${TLPREFIX+x} ]; then
8	echo "Cannot work without TLPREFIX. Exiting."	8	echo "Cannot work without TLPREFIX. Exiting."
9	exit 1	9	exit 1
10	fi	10	fi




# executed for testing.
#

if [ -z ${TLPREFIX+x} ]; then
    echo "Cannot work without TLPREFIX. Exiting."
    exit 1
fi

source ${TLPREFIX}/libexec/functions

if [ -z ${TLSESSIONDATA+x} ]; then
    echo "TLSESSIONDATA is not set. Are you in a proper ThinLinc session?"
    exit 1
fi

Lines 7-13 Link Here

(-)tl-serial-redir.sh.orig (-1 / +1 lines)
7	# action: Setting up serial port redirection	7	# action: Setting up serial port redirection
8	#	8	#
9		9
10	if [ -z "${TLPREFIX}" ]; then	10	if [ -z ${TLPREFIX+x} ]; then
11	echo "Cannot work without TLPREFIX. Exiting."	11	echo "Cannot work without TLPREFIX. Exiting."
12	else	12	else
13	if [ "${LD_PRELOAD}" ]; then	13	if [ "${LD_PRELOAD}" ]; then

Lines 8-14 Link Here

(-)tl-ssh-askpass.orig (-1 / +1 lines)
8	ORIGIN=`(cd "\`dirname \"$ORIGIN\"\`"; pwd -P 2>/dev/null \|\| pwd)`	8	ORIGIN=`(cd "\`dirname \"$ORIGIN\"\`"; pwd -P 2>/dev/null \|\| pwd)`
9		9
10	# Allow user to select which Python to use	10	# Allow user to select which Python to use
11	if [ -z "${PYTHON}" ]; then	11	if [ -z ${PYTHON+x} ]; then
12	PYTHON="python"	12	PYTHON="python"
13	fi	13	fi
14		14

Return to bug 5411

Lines 9-22 Link Here

(-)tl-run-xstartup.d.orig (-2 / +2 lines)
9	# executed for testing.	9	# executed for testing.
10	#	10	#
11		11
12	if [ -z "${TLPREFIX}" ]; then	12	if [ -z ${TLPREFIX+x} ]; then
13	echo "Cannot work without TLPREFIX. Exiting."	13	echo "Cannot work without TLPREFIX. Exiting."
14	exit 1	14	exit 1
15	fi	15	fi
16		16
17	source ${TLPREFIX}/libexec/functions	17	source ${TLPREFIX}/libexec/functions
18		18
19	if [ -z "${TLSESSIONDATA}" ]; then	19	if [ -z ${TLSESSIONDATA+x} ]; then
20	echo "TLSESSIONDATA is not set. Are you in a proper ThinLinc session?"	20	echo "TLSESSIONDATA is not set. Are you in a proper ThinLinc session?"
21	exit 1	21	exit 1
22	fi	22	fi