diff options
| author |   millert <millert@openbsd.org> | 2002-10-04 17:33:45 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2002-10-04 17:33:45 +0000 |
| commit | 3c696abed356ca5d35af87e3ed6e68de589602bd (patch) | |
| tree | 8feda4775f87729f7fd8af5017c3b58e160146f7 | |
| parent | sort -H for modern large filesystems; from McikyeBSD; millert@ ok and multiple ppl testing (diff) | |
| download | wireguard-openbsd-3c696abed356ca5d35af87e3ed6e68de589602bd.tar.xz wireguard-openbsd-3c696abed356ca5d35af87e3ed6e68de589602bd.zip | |
Move the -H to the sort variable declaration itself since the -H
flag is non-standard. This allows people to use a different sort
(like GNU sort) if they want via the sort environment variable.
mickey@ OK
| -rw-r--r-- | usr.bin/locate/locate/concatdb.sh | 6 | ||||
| -rw-r--r-- | usr.bin/locate/locate/mklocatedb.sh | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh index 537ee88e877..1f1fec279ae 100644 --- a/usr.bin/locate/locate/concatdb.sh +++ b/usr.bin/locate/locate/concatdb.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: concatdb.sh,v 1.6 1997/12/13 20:06:12 deraadt Exp $ +# $OpenBSD: concatdb.sh,v 1.7 2002/10/04 17:33:45 millert Exp $ # # Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. # All rights reserved. @@ -32,7 +32,7 @@ # # Sequence of databases is important. # -# $Id: concatdb.sh,v 1.6 1997/12/13 20:06:12 deraadt Exp $ +# $Id: concatdb.sh,v 1.7 2002/10/04 17:33:45 millert Exp $ # The directory containing locate subprograms : ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR @@ -49,7 +49,7 @@ fi # utilities to built locate database : ${bigram=locate.bigram} : ${code=locate.code} -: ${sort=sort} +: ${sort=sort -H} case $# in diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh index c3e216c966f..157a39ba002 100644 --- a/usr.bin/locate/locate/mklocatedb.sh +++ b/usr.bin/locate/locate/mklocatedb.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: mklocatedb.sh,v 1.7 2002/10/04 17:30:42 mickey Exp $ +# $OpenBSD: mklocatedb.sh,v 1.8 2002/10/04 17:33:45 millert Exp $ # # Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. # All rights reserved. @@ -30,7 +30,7 @@ # # usage: mklocatedb [-presort] < filelist > database # -# $Id: mklocatedb.sh,v 1.7 2002/10/04 17:30:42 mickey Exp $ +# $Id: mklocatedb.sh,v 1.8 2002/10/04 17:33:45 millert Exp $ # The directory containing locate subprograms @@ -48,10 +48,10 @@ fi # utilities to built locate database : ${bigram=locate.bigram} : ${code=locate.code} -: ${sort=sort} +: ${sort=sort -H} sortopt="-u -T $TMPDIR" -sortcmd="$sort -H" +sortcmd="$sort" # Input already sorted case X"$1" in |