diff options
| author | Kevin Dalley <kevin@seti.org> | 1998-09-21 02:10:02 +0000 |
|---|---|---|
| committer | Kevin Dalley <kevin@seti.org> | 1998-09-21 02:10:02 +0000 |
| commit | 8e6506dca1a4a76d2e4ce0ae475cd757ed601283 (patch) | |
| tree | 68eef570c2ec1c77dbfaa1c8add6935a92d88f72 | |
| parent | d98500c649ec34bf3dff55174b6b772d7b6e429f (diff) | |
| download | findutils-8e6506dca1a4a76d2e4ce0ae475cd757ed601283.tar.gz | |
* removed "-s /bin/sh" from updatedb change quoting around PRUNEFS
(fixes bug #20812, again, and #26857)
| -rw-r--r-- | locate/updatedb.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/locate/updatedb.sh b/locate/updatedb.sh index 0873530d..3569b5ff 100644 --- a/locate/updatedb.sh +++ b/locate/updatedb.sh @@ -89,7 +89,7 @@ fi : ${bigram=@bigram@} : ${code=@code@} -PATH=$LIBEXECDIR:$BINDIR:/usr/ucb:/bin:/usr/bin:$PATH export PATH +PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH export PATH : ${PRUNEFS=nfs NFS proc} @@ -112,10 +112,10 @@ if test $old = no; then { if test -n "$SEARCHPATHS"; then if [ "$LOCALUSER" != "" ]; then - su -s /bin/sh $LOCALUSER -c \ + su $LOCALUSER -c \ "$find $SEARCHPATHS \ \\( $prunefs_exp \ - -type d -regex \"$PRUNEREGEX\" \\) -prune -o -print" + -type d -regex '$PRUNEREGEX' \\) -prune -o -print" else $find $SEARCHPATHS \ \( $prunefs_exp \ @@ -125,8 +125,8 @@ fi if test -n "$NETPATHS"; then if [ "`whoami`" = root ]; then - su -s /bin/sh $NETUSER -c \ - "$find $NETPATHS \\( -type d -regex \"$PRUNEREGEX\" -prune \\) -o -print" + su $NETUSER -c \ + "$find $NETPATHS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o -print" else $find $NETPATHS \( -type d -regex "$PRUNEREGEX" -prune \) -o -print fi @@ -165,10 +165,10 @@ trap 'rm -f $bigrams $filelist $LOCATE_DB.n; exit' 1 15 { if test -n "$SEARCHPATHS"; then if [ "$LOCALUSER" != "" ]; then - su -s /bin/sh $LOCALUSER -c \ + su $LOCALUSER -c \ "$find $SEARCHPATHS \ \( $prunefs_exp \ - -type d -regex "$PRUNEREGEX" \) -prune -o -print" + -type d -regex '$PRUNEREGEX' \) -prune -o -print" else $find $SEARCHPATHS \ \( $prunefs_exp \ @@ -178,8 +178,8 @@ fi if test -n "$NETPATHS"; then if [ "`whoami`" = root ]; then - su -s /bin/sh $NETUSER -c \ - "$find $NETPATHS \\( -type d -regex \"$PRUNEREGEX\" -prune \\) -o -print" + su $NETUSER -c \ + "$find $NETPATHS \\( -type d -regex '$PRUNEREGEX' -prune \\) -o -print" else $find $NETPATHS \( -type d -regex "$PRUNEREGEX" -prune \) -o -print fi |