Brad Smith <brad@xxxxxxxxxxxx> writes:
> Building on Solaris I noticed the following two issues with Solaris sed.
>
> GEN version-def.h
> sed: Missing newline at end of file standard input.
Perhaps it is this input line it is complaining about. sed works on
text files, and a file that ends in incomplete line was not quite
text.
-REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
+REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
-e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \
-e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \
-e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \
> GEN config-list.h
> sed: illegal option -- E
> Usage: sed [-n] script [file...]
> sed [-n] [-e script]...[-f script_file]...[file...]
This is a bit trickier but should be doable. It does not like the
-E option to use ERE (as opposed to BRE) for pattern matching used
in generate-configlist.sh script.
sed -E '
/^`?[a-zA-Z].*\..*`?::$/ {
/deprecated/d;
s/::$//;
s/`//g;
s/^.*$/ "&",/;
p;};
d'
I think the only problematic one is the first address, whose BRE
equivalent I think is
/^`\{0,1\}[a-zA-Z].*\..*`\{0,1\}::$/
In practice, I suspect \{0,1\} is unnecessarily strict and using
something looser like
/^`*[a-zA-Z].*\..*`*::$/
may be sufficient. Replace the address expression associated with
the {editing command} and drop "-E", and use "-e" for readability,
perhaps?
Totally untested patch follows.
GIT-VERSION-GEN | 2 +-
generate-configlist.sh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git c/GIT-VERSION-GEN w/GIT-VERSION-GEN
index 208e91a17f..de989657fb 100755
--- c/GIT-VERSION-GEN
+++ w/GIT-VERSION-GEN
@@ -82,7 +82,7 @@ read GIT_MAJOR_VERSION GIT_MINOR_VERSION GIT_MICRO_VERSION GIT_PATCH_LEVEL trail
$(echo "$GIT_VERSION" 0 0 0 0 | tr '.a-zA-Z-' ' ')
EOF
-REPLACED=$(printf "%s" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
+REPLACED=$(printf "%s\n" "$INPUT" | sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
-e "s|@GIT_MAJOR_VERSION@|$GIT_MAJOR_VERSION|" \
-e "s|@GIT_MINOR_VERSION@|$GIT_MINOR_VERSION|" \
-e "s|@GIT_MICRO_VERSION@|$GIT_MICRO_VERSION|" \
diff --git c/generate-configlist.sh w/generate-configlist.sh
index 9d2ad6165d..75c39ade20 100755
--- c/generate-configlist.sh
+++ w/generate-configlist.sh
@@ -13,16 +13,16 @@ print_config_list () {
cat <<EOF
static const char *config_name_list[] = {
EOF
- sed -E '
-/^`?[a-zA-Z].*\..*`?::$/ {
+ sed -e '
+ /^`*[a-zA-Z].*\..*`*::$/ {
/deprecated/d;
s/::$//;
s/`//g;
s/^.*$/ "&",/;
p;};
-d' \
+ d' \
"$SOURCE_DIR"/Documentation/*config.adoc \
- "$SOURCE_DIR"/Documentation/config/*.adoc|
+ "$SOURCE_DIR"/Documentation/config/*.adoc |
sort
cat <<EOF
NULL,
