|
|
|
|
Index: locate/updatedb.sh
|
|
|
|
|
--- locate/updatedb.sh.orig 2005-01-29 18:34:23 +0100
|
|
|
|
|
+++ locate/updatedb.sh 2005-02-11 20:20:27 +0100
|
|
|
|
|
@@ -108,6 +108,7 @@
|
|
|
|
|
: ${LOCATE_DB=@LOCATE_DB@}
|
|
|
|
|
|
|
|
|
|
# Directory to hold intermediate files.
|
|
|
|
|
+if [ ".$TMPDIR" = . ]; then
|
|
|
|
|
if test -d /var/tmp; then
|
|
|
|
|
: ${TMPDIR=/var/tmp}
|
|
|
|
|
elif test -d /usr/tmp; then
|
|
|
|
|
@@ -115,7 +116,7 @@
|
|
|
|
|
else
|
|
|
|
|
: ${TMPDIR=/tmp}
|
|
|
|
|
fi
|
|
|
|
|
-export TMPDIR
|
|
|
|
|
+fi
|
|
|
|
|
|
|
|
|
|
# The user to search network directories as.
|
|
|
|
|
: ${NETUSER=daemon}
|
|
|
|
|
@@ -166,7 +167,7 @@
|
|
|
|
|
if test -n "$SEARCHPATHS"; then
|
|
|
|
|
if [ "$LOCALUSER" != "" ]; then
|
|
|
|
|
# : A1
|
|
|
|
|
- su $LOCALUSER -s $SHELL -c \
|
|
|
|
|
+ su $LOCALUSER -c \
|
|
|
|
|
"$find $SEARCHPATHS $FINDOPTIONS \
|
|
|
|
|
\\( $prunefs_exp \
|
|
|
|
|
-type d -regex '$PRUNEREGEX' \\) -prune -o $print_option"
|
|
|
|
|
@@ -182,7 +183,7 @@
|
|
|
|
|
myuid=`getuid`
|
|
|
|
|
if [ "$myuid" = 0 ]; then
|
|
|
|
|
# : A3
|
|
|
|
|
- su $NETUSER -s $SHELL -c \
|
|
|
|
|
+ su $NETUSER -c \
|
|
|
|
|
"$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o $print_option" ||
|
|
|
|
|
exit $?
|
|
|
|
|
else
|
|
|
|
|
@@ -236,7 +237,7 @@
|
|
|
|
|
if test -n "$SEARCHPATHS"; then
|
|
|
|
|
if [ "$LOCALUSER" != "" ]; then
|
|
|
|
|
# : A5
|
|
|
|
|
- su $LOCALUSER -s $SHELL -c \
|
|
|
|
|
+ su $LOCALUSER -c \
|
|
|
|
|
"$find $SEARCHPATHS $FINDOPTIONS \
|
|
|
|
|
\( $prunefs_exp \
|
|
|
|
|
-type d -regex '$PRUNEREGEX' \) -prune -o $print_option" || exit $?
|
|
|
|
|
@@ -252,7 +253,7 @@
|
|
|
|
|
myuid=`getuid`
|
|
|
|
|
if [ "$myuid" = 0 ]; then
|
|
|
|
|
# : A7
|
|
|
|
|
- su $NETUSER -s $SHELL -c \
|
|
|
|
|
+ su $NETUSER -c \
|
|
|
|
|
"$find $NETPATHS $FINDOPTIONS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o $print_option" ||
|
|
|
|
|
exit $?
|
|
|
|
|
else
|
