Attachment 150514 Details for Bug 177018 – Break sed-commands apart -- into separate -e arguments

[patch] Break sed-commands apart -- into separate -e arguments

patch-dep (text/plain), 1.16 KB, created by Mikhail T. on 2014-12-12 21:14:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2014-12-12 21:14:55 UTC

Size: 1.16 KB

patch

obsolete

>--- build-0.3/c/gnu/dep	2010-04-27 14:22:22.000000000 -0400
>+++ build-0.3/c/gnu/dep	2014-12-12 16:10:56.000000000 -0500
>@@ -1,3 +1,3 @@
>-#! /usr/bin/env bash
>+#!/bin/sh -x
> 
> # file      : build/c/gnu/dep
>@@ -21,5 +21,5 @@
> script=
> 
>-function gen_script ()
>+gen_script ()
> {
>   while [ "$1" ]; do
>@@ -34,10 +34,10 @@
>     #
>     script="$script"\
>-"s \\ $prefix \\ $path$prefix g;"\
>-"s \\ /usr/include/$prefix \\ $path$prefix g;"\
>-"s \\ /usr/local/include/$prefix \\ $path$prefix g;"\
>-"s ^$prefix $path$prefix ;"\
>-"s ^/usr/include/$prefix $path$prefix ;"\
>-"s ^/usr/local/include/$prefix $path$prefix ;"
>+" -e 's| $prefix| $path$prefix|g'"\
>+" -e 's| /usr/include/$prefix| $path$prefix|g'"\
>+" -e 's| /usr/local/include/$prefix| $path$prefix|g'"\
>+" -e 's|^$prefix|$path$prefix|'"\
>+" -e 's|^/usr/include/$prefix|$path$prefix|'"\
>+" -e 's|^/usr/local/include/$prefix|$path$prefix|'"
>   done
> }
>@@ -54,5 +54,4 @@
> # some other place (e.g., /usr/include).
> #
>-epilogue="s% $[^/. \\\\]$% $out_base/\1%g;s%^$[^/. ].*:$%$out_base/\1%"
>-
>-exec sed -e "$script$epilogue"
>+script="${script} -e 's% $[^/. \\\\]$% $out_base/\1%g;s%^$[^/. ].*:$%$out_base/\1%'"
>+eval exec sed $script

Actions: View | Diff

Attachments on bug 177018: 150476 | 150485 | 150513 | 150514