mkinitrd unification across distributions
 help / color / mirror / Atom feed
* [PATCH] Make bash regexes behave
@ 2009-02-27 14:16 Seewer Philippe
  0 siblings, 0 replies; only message in thread
From: Seewer Philippe @ 2009-02-27 14:16 UTC (permalink / raw)
  To: <initramfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>

On some systems with newer or unpatched bash versions the whole right 
portion of =~ is considered part of the regex. Means we need to get rid 
of enclosing ''.

This patch fixes this.

--
  dracut-functions |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dracut-functions b/dracut-functions
index d95d267..2f63e31 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -82,17 +82,17 @@ inst_binary() {
      # I love bash!
      while read line; do
  	[[ $line = 'not a dynamic executable' ]] && return 1
-	[[ $line =~ 'not found' ]] &&{
+	[[ $line =~ not\ found ]] &&{
  	    echo "Missing a shared library required by $bin." >&2
  	    echo "Run \"ldd $bin\" to find out what it is." >&2
  	    echo "dracut cannot create an initrd." >&2
  	    exit 1
  	}
-	[[ $line =~ '([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*)' ]] || continue
+	[[ $line =~ ([^ ]*/lib[^/]*/[^ ]*\.so[^ ]*) ]] || continue
  	FILE=${BASH_REMATCH[1]}
  	[[ -f ${initdir}$FILE ]] && continue
  	# see if we are loading an optimized version of a shared lib.
-	[[ $FILE =~ '^(/lib[^/]*).*' ]] && {
+	[[ $FILE =~ ^(/lib[^/]*).* ]] && {
              TLIBDIR=${BASH_REMATCH[1]}
              BASE="${FILE##*/}"
  	    # prefer nosegneg libs, then unoptimized ones.
@@ -115,7 +115,7 @@ inst_binary() {
  inst_script() {
      local src=$1 target=${2:-$1} line
      read -r -n 80 line <"$src"
-    [[ $line =~ '(#! *)(/[^ ]+).*' ]] || return 1
+    [[ $line =~ (#! *)(/[^ ]+).* ]] || return 1
      inst "${BASH_REMATCH[2]}" && inst_simple "$src" "$target"
  }


--
To unsubscribe from this list: send the line "unsubscribe initramfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-02-27 14:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-27 14:16 [PATCH] Make bash regexes behave Seewer Philippe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox