* gnulib: Do the above.
* bootstrap: Update from gnulib.
* doc/find.texi: s/time stamp/timestamp/ to adhere to new syntax-check
rule from gnulib.
---
bootstrap | 40 +++++++++++++++++++++-------------------
doc/find.texi | 6 +++---
gnulib | 2 +-
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/bootstrap b/bootstrap
index f060bab8..932ff85e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,10 +1,10 @@
#! /bin/sh
# Print a version string.
-scriptversion=2016-01-24.06; # UTC
+scriptversion=2017-01-09.19; # UTC
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2016 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available
done
}
-get_version() {
- app=$1
+get_version_sed='
+# Move version to start of line.
+s/.*[v ]\([0-9]\)/\1/
- $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+# Skip lines that do not start with version.
+/^[0-9]/!d
- $app --version 2>&1 |
- sed -n '# Move version to start of line.
- s/.*[v ]\([0-9]\)/\1/
+# Remove characters after the version.
+s/[^.a-z0-9-].*//
- # Skip lines that do not start with version.
- /^[0-9]/!d
+# The first component must be digits only.
+s/^\([0-9]*\)[a-z-].*/\1/
- # Remove characters after the version.
- s/[^.a-z0-9-].*//
+#the following essentially does s/5.005/5.5/
+s/\.0*\([1-9]\)/.\1/g
+p
+q'
- # The first component must be digits only.
- s/^\([0-9]*\)[a-z-].*/\1/
+get_version() {
+ app=$1
+
+ $app --version >/dev/null 2>&1 || { $app --version; return 1; }
- #the following essentially does s/5.005/5.5/
- s/\.0*\([1-9]\)/.\1/g
- p
- q'
+ $app --version 2>&1 | sed -n "$get_version_sed"
}
check_versions() {
@@ -788,7 +790,7 @@ symlink_to_dir()
# Leave any existing symlink alone, if it already points to the source,
# so that broken build tools that care about symlink times
# aren't confused into doing unnecessary builds. Conversely, if the
- # existing symlink's time stamp is older than the source, make it afresh,
+ # existing symlink's timestamp is older than the source, make it afresh,
# so that broken tools aren't confused into skipping needed builds. See
# <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
test -h "$dst" &&
diff --git a/doc/find.texi b/doc/find.texi
index b3c5d106..401b7139 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -842,7 +842,7 @@ File has fewer than @var{n} hard links.
@node Time
@section Time
-Each file has three time stamps, which record the last time that
+Each file has three timestamps, which record the last time that
certain operations were performed on the file:
@enumerate
@@ -862,8 +862,8 @@ However, even on systems which support file birth time,
files may
exist for which this information was not recorded (for example, UFS1
file systems simply do not contain this information).
-You can search for files whose time stamps are within a certain age
-range, or compare them to other time stamps.
+You can search for files whose timestamps are within a certain age
+range, or compare them to other timestamps.
@menu
* Age Ranges::
diff --git a/gnulib b/gnulib
index 77d36b55..365ad41b 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 77d36b554f9742c91d7645f7648190af619284c0
+Subproject commit 365ad41b06cb98e75d907159ada91ccd3e6ef51e
--
2.11.0
