Attachment 689262 Details for Bug 875356 – 0001-source-and-inherit-when-pipe-stage-is-a-shell-script.patch

[patch] 0001-source-and-inherit-when-pipe-stage-is-a-shell-script.patch

0001-source-and-inherit-when-pipe-stage-is-a-shell-script.patch (text/plain), 6.96 KB, created by John Reiser on 2013-01-28 19:25:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Reiser

Created: 2013-01-28 19:25:14 UTC

Size: 6.96 KB

patch

obsolete

>From 8b4a2fdb73a24d253c19ab5000d7b9d153b4cc35 Mon Sep 17 00:00:00 2001
>From: John Reiser <jreiser@BitWagon.com>
>Date: Mon, 3 Dec 2012 13:34:51 -0800
>Subject: [PATCH 1/4] "source" and inherit when pipe stage is a shell script.
>
>---
> os-prober                                         | 4 ++--
> os-probes/common/50mounted-tests                  | 2 +-
> os-probes/mounted/common/90linux-distro           | 2 +-
> os-probes/mounted/m68k/10macos6-9                 | 2 +-
> os-probes/mounted/powerpc/10macos6-9              | 2 +-
> os-probes/mounted/powerpc/20macosx                | 2 +-
> os-probes/mounted/powerpc/20macosx.macosxdummyfix | 2 +-
> os-probes/mounted/sparc/80solaris                 | 2 +-
> os-probes/mounted/x86/10freedos                   | 2 +-
> os-probes/mounted/x86/10qnx                       | 2 +-
> os-probes/mounted/x86/20microsoft                 | 2 +-
> os-probes/mounted/x86/30utility                   | 2 +-
> os-probes/mounted/x86/70hurd                      | 2 +-
> os-probes/mounted/x86/80minix                     | 2 +-
> os-probes/mounted/x86/83haiku                     | 2 +-
> os-probes/mounted/x86/90solaris                   | 2 +-
> 16 files changed, 17 insertions(+), 17 deletions(-)
>
>diff --git a/os-prober b/os-prober
>index f821d5f..19aaa1c 100755
>--- a/os-prober
>+++ b/os-prober
>@@ -170,7 +170,7 @@ for test in $libexecpfx/mounted/* \
>             $libexecpfx/mounted/common/*  # last two lines: test without install
> do
>     if [ -r "$test" -a -x "$test" -a ! -d "$test" ]; then
>-        pipe_mounted="$pipe_mounted|$test"
>+        pipe_mounted="$pipe_mounted|source $test"
>     fi
> done
> pipe_mounted="${pipe_mounted#|}"
>@@ -179,7 +179,7 @@ pipe_mounted="${pipe_mounted#|}"
> pipe_not_yet=""
> for test in $libexecpfx/*; do
>     if [ -r "$test" -a -x "$test" -a ! -d "$test" ]; then
>-        pipe_not_yet="$pipe_not_yet|$test"
>+        pipe_not_yet="$pipe_not_yet|source $test"
>     fi
> done
> pipe_not_yet="${pipe_not_yet#|}"
>diff --git a/os-probes/common/50mounted-tests b/os-probes/common/50mounted-tests
>index 33824d5..01c336e 100755
>--- a/os-probes/common/50mounted-tests
>+++ b/os-probes/common/50mounted-tests
>@@ -2,7 +2,7 @@
> # Sub-tests that require a mounted partition.
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> delay_types=""  # file system types that should be checked last
> kfs_types=""  # kernel file system types
>diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
>index 87ec273..cbcff3c 100755
>--- a/os-probes/mounted/common/90linux-distro
>+++ b/os-probes/mounted/common/90linux-distro
>@@ -2,7 +2,7 @@
> # Test for linux distributions.
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> path_lookup cat; export cat  # search once only
> 
> origdir=$PWD
>diff --git a/os-probes/mounted/m68k/10macos6-9 b/os-probes/mounted/m68k/10macos6-9
>index 646c7a7..2884f2e 100755
>--- a/os-probes/mounted/m68k/10macos6-9
>+++ b/os-probes/mounted/m68k/10macos6-9
>@@ -1,6 +1,6 @@
> #!/bin/sh
> # Probe for OS 9 via System suitcase check.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> set -e
> 
>diff --git a/os-probes/mounted/powerpc/10macos6-9 b/os-probes/mounted/powerpc/10macos6-9
>index 2415a04..a5592ea 100755
>--- a/os-probes/mounted/powerpc/10macos6-9
>+++ b/os-probes/mounted/powerpc/10macos6-9
>@@ -1,6 +1,6 @@
> #!/bin/sh
> # Probe for OS 9 via System suitcase check.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> set -e
> 
>diff --git a/os-probes/mounted/powerpc/20macosx b/os-probes/mounted/powerpc/20macosx
>index e97f30d..fa10b57 100755
>--- a/os-probes/mounted/powerpc/20macosx
>+++ b/os-probes/mounted/powerpc/20macosx
>@@ -1,6 +1,6 @@
> #!/bin/sh -e
> # Detects Mac OS X. I don't yet know how Mac OS <= 9 fits into this.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> partition="$1"
> mpoint="$2"
>diff --git a/os-probes/mounted/powerpc/20macosx.macosxdummyfix b/os-probes/mounted/powerpc/20macosx.macosxdummyfix
>index 5ad29da..68d5a14 100755
>--- a/os-probes/mounted/powerpc/20macosx.macosxdummyfix
>+++ b/os-probes/mounted/powerpc/20macosx.macosxdummyfix
>@@ -1,6 +1,6 @@
> #!/bin/sh -e
> # Detects Mac OS X. I don't yet know how Mac OS <= 9 fits into this.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> partition="$1"
> mpoint="$2"
>diff --git a/os-probes/mounted/sparc/80solaris b/os-probes/mounted/sparc/80solaris
>index 8fbe34c..d5cf8c8 100755
>--- a/os-probes/mounted/sparc/80solaris
>+++ b/os-probes/mounted/sparc/80solaris
>@@ -4,7 +4,7 @@
> 
> set -e
> 
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> partition="$1"
> dir="$2"
>diff --git a/os-probes/mounted/x86/10freedos b/os-probes/mounted/x86/10freedos
>index a15a957..daf58dd 100755
>--- a/os-probes/mounted/x86/10freedos
>+++ b/os-probes/mounted/x86/10freedos
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/10qnx b/os-probes/mounted/x86/10qnx
>index 6f1dc70..a6d15f5 100755
>--- a/os-probes/mounted/x86/10qnx
>+++ b/os-probes/mounted/x86/10qnx
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
>index f68d453..41fcda7 100755
>--- a/os-probes/mounted/x86/20microsoft
>+++ b/os-probes/mounted/x86/20microsoft
>@@ -3,7 +3,7 @@
> 
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/30utility b/os-probes/mounted/x86/30utility
>index 995e523..48257c6 100755
>--- a/os-probes/mounted/x86/30utility
>+++ b/os-probes/mounted/x86/30utility
>@@ -3,7 +3,7 @@
> 
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/70hurd b/os-probes/mounted/x86/70hurd
>index 3e23ee0..755324a 100755
>--- a/os-probes/mounted/x86/70hurd
>+++ b/os-probes/mounted/x86/70hurd
>@@ -1,7 +1,7 @@
> #!/bin/sh
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/80minix b/os-probes/mounted/x86/80minix
>index edb09ed..412cedf 100755
>--- a/os-probes/mounted/x86/80minix
>+++ b/os-probes/mounted/x86/80minix
>@@ -1,7 +1,7 @@
> #!/bin/sh
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/83haiku b/os-probes/mounted/x86/83haiku
>index ccd1555..bfeb262 100755
>--- a/os-probes/mounted/x86/83haiku
>+++ b/os-probes/mounted/x86/83haiku
>@@ -2,7 +2,7 @@
> # Detects Haiku on BeFS partitions.
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>diff --git a/os-probes/mounted/x86/90solaris b/os-probes/mounted/x86/90solaris
>index 00359ec..4e10cbd 100755
>--- a/os-probes/mounted/x86/90solaris
>+++ b/os-probes/mounted/x86/90solaris
>@@ -4,7 +4,7 @@
> 
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 875356: 652201 | 688069 | 689262 | 689263 | 689264 | 689265 | 692170 | 692171 | 692172