Attachment #458 for bug #675

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 675
Collapse All | Expand All




  echo "[starttde] TDE version is $TDE_VERSION" 1>&2
  TDEDIR=`echo $BIN_DIR | sed 's|/bin||'`
  echo "[starttde] TDE base directory is $TDEDIR" 1>&2
  echo
else
  echo "[starttde] Unable to determine TDE base directory."
  echo "[starttde] This script should be installed in the same directory."

  fi
fi

# In case we have been started with full pathname spec without being in PATH.
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
if [ -n "$bindir" ]; then
  case $PATH in
    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
    *) PATH=$bindir:$PATH; export PATH;;
  esac
fi

# Boot sequence:
#
# tdeinit is used to fork off processes which improves memory usage

fi
if [ -d $TDEDIR/bin ]; then
  if [ -z "`echo $PATH | grep \"$TDEDIR/bin\"`" ]; then
    # Respect the traditional path order. Don't blindly place $TDEDIR/bin
    # first in the path. Only place $TDEDIR/bin before /usr/bin. This order is
    # consistent with tdelibs/tdesu/stub.cpp. If packagers are adding $TDEDIR/bin
    # elsewhere, then they need to ensure the traditional search patch is respected.
    # Is there a way we can check that $TDEDIR/bin is always placed only just before
    # /usr/bin in the search path?
    if [ -n "`echo $PATH | grep \"^/usr/bin:\"`" ]; then
      export PATH="`echo $PATH | sed \"s|^/usr/bin:|$TDEDIR/bin:/usr/bin:|\"`"
    elif [ -n "`echo $PATH | grep \":/usr/bin$\"`" ]; then
      export PATH="`echo $PATH | sed \"s|:/usr/bin$|:$TDEDIR/bin:/usr/bin|\"`"
    elif [ -n "`echo $PATH | grep \":/usr/bin:\"`" ]; then
      export PATH="`echo $PATH | sed \"s|:/usr/bin:|:$TDEDIR/bin:/usr/bin:|\"`"
    else
      export PATH=$TDEDIR/bin:$PATH
    fi
  fi
fi
# Caution: This snippet will not accomplish the intent when $SYSCONFDIR != /etc/trinity.
if [ -z "`echo $XDG_CONFIG_DIRS | grep \"/etc/trinity/xdg\"`" ]; then
  if [ "$XDG_CONFIG_DIRS" = "" ]; then
    if [ -d /etc/xdg ]; then
      XDG_CONFIG_DIRS=/etc/xdg:/etc/trinity/xdg
    else
      XDG_CONFIG_DIRS=/etc/trinity/xdg
    fi
  else
    XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/trinity/xdg
  fi
  export XDG_CONFIG_DIRS
fi
# Explicitly set $XDG_DATA_DIRS only when Trinity is not installed in /usr.
# Explicitly declaring $XDG_DATA_DIRS will override the default search path of /usr/share.
if [ "$TDEDIR" != "/usr" ] && [ -d $TDEDIR/share ]; then
  if [ "$XDG_DATA_DIRS" = "" ]; then
    # Ensure the standard location of /usr/share is included.
    XDG_DATA_DIRS=/usr/share
  else
    if [ -z "`echo $XDG_DATA_DIRS | grep \"/usr/share\"`" ]; then
      XDG_DATA_DIRS=/usr/share:$XDG_DATA_DIRS
    fi
    export XDG_CONFIG_DIRS
  fi
  if [ -z "`echo $XDG_DATA_DIRS | grep \"$TDEDIR/share\"`" ]; then
    XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share
  fi
  export XDG_DATA_DIRS
fi
if [ -d $TDEDIR/share/man ]; then
  if [ -z "`echo $MANPATH | grep \"$TDEDIR/share/man\"`" ]; then

  fi
fi

if [ -n "$TGTK_PRELOAD" ]; then
  if [ -e /usr/lib64/libnspr4.so ]; then
    TGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:"
  elif [ -e /usr/lib/libnspr4.so ]; then
    TGTK_NSPR_PRELOAD="/usr/libnspr4.so:"
  fi
  export LD_PRELOAD=$TGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD
fi

Return to bug 675

Lines 33-39 Link Here

(-)tdebase/starttde (-27 / +42 lines)
33	echo "[starttde] TDE version is $TDE_VERSION" 1>&2	33	echo "[starttde] TDE version is $TDE_VERSION" 1>&2
34	TDEDIR=`echo $BIN_DIR \| sed 's\|/bin\|\|'`	34	TDEDIR=`echo $BIN_DIR \| sed 's\|/bin\|\|'`
35	echo "[starttde] TDE base directory is $TDEDIR" 1>&2	35	echo "[starttde] TDE base directory is $TDEDIR" 1>&2
36	echo
37	else	36	else
38	echo "[starttde] Unable to determine TDE base directory."	37	echo "[starttde] Unable to determine TDE base directory."
39	echo "[starttde] This script should be installed in the same directory."	38	echo "[starttde] This script should be installed in the same directory."
Lines 76-90 Link Here
76	fi	75	fi
77	fi	76	fi
78		77
79	# In case we have been started with full pathname spec without being in PATH.
80	bindir=`echo "$0" \| sed -n 's,^\(/.\)/[^/][^/]$,\1,p'`
81	if [ -n "$bindir" ]; then
82	case $PATH in
83	$bindir\|$bindir:\|:$bindir\|:$bindir:) ;;
84	*) PATH=$bindir:$PATH; export PATH;;
85	esac
86	fi
87
88	# Boot sequence:	78	# Boot sequence:
89	#	79	#
90	# tdeinit is used to fork off processes which improves memory usage	80	# tdeinit is used to fork off processes which improves memory usage
Lines 165-192 Link Here
165	fi	155	fi
166	if [ -d $TDEDIR/bin ]; then	156	if [ -d $TDEDIR/bin ]; then
167	if [ -z "`echo $PATH \| grep \"$TDEDIR/bin\"`" ]; then	157	if [ -z "`echo $PATH \| grep \"$TDEDIR/bin\"`" ]; then
168	export PATH=$TDEDIR/bin:$PATH	158	# Respect the traditional path order. Don't blindly place $TDEDIR/bin
		159	# first in the path. Only place $TDEDIR/bin before /usr/bin. This order is
		160	# consistent with tdelibs/tdesu/stub.cpp. If packagers are adding $TDEDIR/bin
		161	# elsewhere, then they need to ensure the traditional search patch is respected.
		162	# Is there a way we can check that $TDEDIR/bin is always placed only just before
		163	# /usr/bin in the search path?
		164	if [ -n "`echo $PATH \| grep \"^/usr/bin:\"`" ]; then
		165	export PATH="`echo $PATH \| sed \"s\|^/usr/bin:\|$TDEDIR/bin:/usr/bin:\|\"`"
		166	elif [ -n "`echo $PATH \| grep \":/usr/bin$\"`" ]; then
		167	export PATH="`echo $PATH \| sed \"s\|:/usr/bin$\|:$TDEDIR/bin:/usr/bin\|\"`"
		168	elif [ -n "`echo $PATH \| grep \":/usr/bin:\"`" ]; then
		169	export PATH="`echo $PATH \| sed \"s\|:/usr/bin:\|:$TDEDIR/bin:/usr/bin:\|\"`"
		170	else
		171	export PATH=$TDEDIR/bin:$PATH
		172	fi
169	fi	173	fi
170	fi	174	fi
171	if [ -d $TDEDIR/share ]; then	175	# Caution: This snippet will not accomplish the intent when $SYSCONFDIR != /etc/trinity.
172	if [ -z "`echo $XDG_DATA_DIRS \| grep \"$TDEDIR/share\"`" ]; then	176	if [ -z "`echo $XDG_CONFIG_DIRS \| grep \"/etc/trinity/xdg\"`" ]; then
173	if [ "$XDG_DATA_DIRS" = "" ]; then	177	if [ "$XDG_CONFIG_DIRS" = "" ]; then
174	XDG_DATA_DIRS=$TDEDIR/share	178	if [ -d /etc/xdg ]; then
		179	XDG_CONFIG_DIRS=/etc/xdg:/etc/trinity/xdg
175	else	180	else
176	XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share	181	XDG_CONFIG_DIRS=/etc/trinity/xdg
177	fi	182	fi
178	export XDG_DATA_DIRS	183	else
		184	XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/trinity/xdg
179	fi	185	fi
		186	export XDG_CONFIG_DIRS
180	fi	187	fi
181	if [ -d $TDEDIR/etc/xdg ]; then	188	# Explicitly set $XDG_DATA_DIRS only when Trinity is not installed in /usr.
182	if [ -z "`echo $XDG_CONFIG_DIRS \| grep \"$TDEDIR/etc/xdg\"`" ]; then	189	# Explicitly declaring $XDG_DATA_DIRS will override the default search path of /usr/share.
183	if [ "$XDG_CONFIG_DIRS" = "" ]; then	190	if [ "$TDEDIR" != "/usr" ] && [ -d $TDEDIR/share ]; then
184	XDG_CONFIG_DIRS=$TDEDIR/etc/xdg	191	if [ "$XDG_DATA_DIRS" = "" ]; then
185	else	192	# Ensure the standard location of /usr/share is included.
186	XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg	193	XDG_DATA_DIRS=/usr/share
		194	else
		195	if [ -z "`echo $XDG_DATA_DIRS \| grep \"/usr/share\"`" ]; then
		196	XDG_DATA_DIRS=/usr/share:$XDG_DATA_DIRS
187	fi	197	fi
188	export XDG_CONFIG_DIRS
189	fi	198	fi
		199	if [ -z "`echo $XDG_DATA_DIRS \| grep \"$TDEDIR/share\"`" ]; then
		200	XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share
		201	fi
		202	export XDG_DATA_DIRS
190	fi	203	fi
191	if [ -d $TDEDIR/share/man ]; then	204	if [ -d $TDEDIR/share/man ]; then
192	if [ -z "`echo $MANPATH \| grep \"$TDEDIR/share/man\"`" ]; then	205	if [ -z "`echo $MANPATH \| grep \"$TDEDIR/share/man\"`" ]; then
Lines 446-454 Link Here
446	fi	459	fi
447	fi	460	fi
448		461
449	if [ -n $TGTK_PRELOAD ]; then	462	if [ -n "$TGTK_PRELOAD" ]; then
450	if [ -e /usr/lib/libnspr4.so ]; then	463	if [ -e /usr/lib64/libnspr4.so ]; then
451	KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:"	464	TGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:"
		465	elif [ -e /usr/lib/libnspr4.so ]; then
		466	TGTK_NSPR_PRELOAD="/usr/libnspr4.so:"
452	fi	467	fi
453	export LD_PRELOAD=$TGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD	468	export LD_PRELOAD=$TGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD
454	fi	469	fi