projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9fe78b
)
Use "sort -u" where it makes sense.
author
Bruno Haible
<bruno@clisp.org>
Mon, 18 Sep 2006 12:54:13 +0000
(12:54 +0000)
committer
Bruno Haible
<bruno@clisp.org>
Mon, 18 Sep 2006 12:54:13 +0000
(12:54 +0000)
ChangeLog
patch
|
blob
|
history
gnulib-tool
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index f1fd2601b123eb48e908542ede007b2b43823650..627d3515309d2218dd59737d84b8c2359cfde956 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,8
@@
+2006-09-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ * gnulib-tool (func_all_modules, func_modules_to_filelist, func_import,
+ func_create_testdir, ...): Change 'sort | uniq' to 'sort -u'.
+
2006-09-15 Paul Eggert <eggert@cs.ucla.edu>
* modules/mkancesdirs (Depends-on): Add fcntl.
2006-09-15 Paul Eggert <eggert@cs.ucla.edu>
* modules/mkancesdirs (Depends-on): Add fcntl.
diff --git
a/gnulib-tool
b/gnulib-tool
index ffab065be9221b088e7294b3805140f1605d986d..232802d4426702bfb9d2cc50e086c042dd103b68 100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-22,7
+22,7
@@
progname=$0
package=gnulib
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2006-09-1
3 15:00:47
$'
+cvsdatestamp='$Date: 2006-09-1
8 12:54:13
$'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
@@
-625,7
+625,7
@@
func_relconcat ()
}'
eval `sed -n -e "$my_sed_traces" < "$configure_ac"`
if test -n "$prereqs"; then
}'
eval `sed -n -e "$my_sed_traces" < "$configure_ac"`
if test -n "$prereqs"; then
- autoconf_minversion=`for version in $prereqs; do echo $version; done | $SORT -g
| uniq
| tail -1`
+ autoconf_minversion=`for version in $prereqs; do echo $version; done | $SORT -g
-u
| tail -1`
fi
fi
if test -z "$autoconf_minversion"; then
fi
fi
if test -z "$autoconf_minversion"; then
@@
-737,8
+737,7
@@
func_all_modules ()
} \
| sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^COPYING$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \
| sed -e '/-tests$/d' \
} \
| sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^COPYING$/d' -e '/^README$/d' -e '/^TEMPLATE$/d' -e '/^TEMPLATE-TESTS$/d' -e '/~$/d' \
| sed -e '/-tests$/d' \
- | LC_ALL=C sort \
- | LC_ALL=C uniq
+ | LC_ALL=C sort -u
}
# func_verify_module
}
# func_verify_module
@@
-1019,7
+1018,7
@@
func_modules_to_filelist ()
files="$files "`func_get_filelist $module`
fi
done
files="$files "`func_get_filelist $module`
fi
done
- files=`for f in $files; do echo $f; done | LC_ALL=C sort
| LC_ALL=C uniq
`
+ files=`for f in $files; do echo $f; done | LC_ALL=C sort
-u
`
}
# func_emit_lib_Makefile_am
}
# func_emit_lib_Makefile_am
@@
-1423,7
+1422,7
@@
func_import ()
fi
# Canonicalize the list of specified modules.
fi
# Canonicalize the list of specified modules.
- specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort
| LC_ALL=C uniq
`
+ specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort
-u
`
# Determine final module list.
modules="$specified_modules"
# Determine final module list.
modules="$specified_modules"
@@
-2011,7
+2010,7
@@
func_create_testdir ()
{
testdir="$1"
modules="$2"
{
testdir="$1"
modules="$2"
- modules=`for m in $modules; do echo $m; done | LC_ALL=C sort
| LC_ALL=C uniq
`
+ modules=`for m in $modules; do echo $m; done | LC_ALL=C sort
-u
`
# Subdirectory names.
sourcebase=gllib
# Subdirectory names.
sourcebase=gllib
@@
-2467,7
+2466,7
@@
case $mode in
sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p'
sedexpr2='s,^[^/]*$,.,'
sedexpr3='s,/[^/]*$,,'
sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p'
sedexpr2='s,^[^/]*$,.,'
sedexpr3='s,/[^/]*$,,'
- m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort
| LC_ALL=C uniq
`
+ m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort
-u
`
m4dirs_count=`echo "$m4dirs" | wc -l`
fi
fi
m4dirs_count=`echo "$m4dirs" | wc -l`
fi
fi