use SED in scripts/mk-pkg-add script, use set -e consistently
* scripts/mk-pkg-add: Initialize SED from environment and use it.
* libinterp/mk-pkg-add: Use set -e instead of bin/sh -e.
| author |
John W. Eaton <jwe@octave.org> |
| date |
Tue, 25 Jun 2013 11:10:26 -0400 |
| parents |
e6401864d791 |
| children |
77c8aae15908 |
| files |
libinterp/mk-pkg-add scripts/mk-pkg-add |
| diffstat |
2 files changed, 6 insertions(+), 2 deletions(-)
[+]
|
line diff
--- a/libinterp/mk-pkg-add
+++ b/libinterp/mk-pkg-add
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh
#
# Copyright (C) 2005-2012 John W. Eaton
#
@@ -18,6 +18,8 @@
# along with Octave; see the file COPYING. If not, see
# <http://www.gnu.org/licenses/>.
+set -e
+
SED=${SED:-'sed'}
for f in "$@"; do
--- a/scripts/mk-pkg-add
+++ b/scripts/mk-pkg-add
@@ -24,6 +24,8 @@
set -e
+SED=${SED:-'sed'}
+
prefix="$1/"
shift
@@ -32,6 +34,6 @@
if [ "$arg" = "--" ]; then
prefix=""
else
- sed -n 's/^[#%][#%]* *PKG_ADD: *//p' "$prefix$arg"
+ $SED -n 's/^[#%][#%]* *PKG_ADD: *//p' "$prefix$arg"
fi
done
