Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/scripts/gen_build_files.sh

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/scripts/gen_build_files.sh (modified) (6 diffs)

branches/3.2/mindi-busybox/scripts/gen_build_files.sh

@@ -1 +1 @@
 #!/bin/sh
+
+# Note: was using sed OPTS CMD -- FILES
+# but users complain that many sed implementations
+# are misinterpreting --.
 
 test $# -ge 2 || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
@@ -16 +20 @@
 generate()
 {
-    local src="$1" dst="$2" header="$3" insert="$4"
+    # NB: data to be inserted at INSERT line is coming on stdin
+    local src="$1" dst="$2" header="$3"
     #chk "${dst}"
-    (
+    {
+        # Need to use printf: different shells have inconsistent
+        # rules re handling of "\n" in echo params.
         printf "%s\n" "${header}"
-        if grep -qs '^INSERT$' "${src}"; then
-            sed -n '1,/^INSERT$/p' "${src}"
-            printf "%s\n" "${insert}"
-            sed -n '/^INSERT$/,$p' "${src}"
-        else
-            if [ -n "${insert}" ]; then
-                printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
-            fi
-            cat "${src}"
-        fi
-    ) | sed '/^INSERT$/d' > "${dst}.tmp"
+        # print everything up to INSERT line
+        sed -n '/^INSERT$/ q; p' "${src}"
+        # copy stdin to stdout
+        cat
+        # print everything after INSERT line
+        sed -n '/^INSERT$/ { :l; n; p; bl }' "${src}"
+    } >"${dst}.tmp"
     if ! cmp -s "${dst}" "${dst}.tmp"; then
         gen "${dst}"
@@ -40 +43 @@
 
 # (Re)generate include/applets.h
-s=`sed -n 's@^//applet:@@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-generate \
+sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \
+| generate \
     "$srctree/include/applets.src.h" \
     "include/applets.h" \
-    "/* DO NOT EDIT. This file is generated from applets.src.h */" \
-    "${s}"
+    "/* DO NOT EDIT. This file is generated from applets.src.h */"
 
 # (Re)generate include/usage.h
@@ -51 +53 @@
 # and insert empty line before each line which doesn't start
 # with space or tab
-# (note: we need to use \\\\ because of ``)
-s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-generate \
+sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' \
+    "$srctree"/*/*.c "$srctree"/*/*/*.c \
+| generate \
     "$srctree/include/usage.src.h" \
     "include/usage.h" \
-    "/* DO NOT EDIT. This file is generated from usage.src.h */" \
-    "${s}"
+    "/* DO NOT EDIT. This file is generated from usage.src.h */"
 
 # (Re)generate */Kbuild and */Config.in
-{ cd -- "$srctree" && find . -type d; } | while read -r d; do
+# We skip .dotdirs - makes git/svn/etc users happier
+{ cd -- "$srctree" && find . -type d -not '(' -name '.?*' -prune ')'; } \
+| while read -r d; do
     d="${d#./}"
 
@@ -68 +71 @@
         mkdir -p -- "$d" 2>/dev/null
 
-        s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
-        generate \
+        sed -n 's@^//kbuild:@@p' "$srctree/$d"/*.c \
+        | generate \
             "${src}" "${dst}" \
-            "# DO NOT EDIT. This file is generated from Kbuild.src" \
-            "${s}"
+            "# DO NOT EDIT. This file is generated from Kbuild.src"
     fi
 
@@ -80 +82 @@
         mkdir -p -- "$d" 2>/dev/null
 
-        s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
-        generate \
+        sed -n 's@^//config:@@p' "$srctree/$d"/*.c \
+        | generate \
             "${src}" "${dst}" \
-            "# DO NOT EDIT. This file is generated from Config.src" \
-            "${s}"
+            "# DO NOT EDIT. This file is generated from Config.src"
     fi
 done