# HG changeset patch # User John W. Eaton # Date 1372173026 14400 # Node ID 474e6d189de1246ffdb4fbceec8919b694b1f16d # Parent e6401864d7915ef26e2b504a5524b1adf9acc4d2 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. diff --git a/libinterp/mk-pkg-add b/libinterp/mk-pkg-add --- 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 # . +set -e + SED=${SED:-'sed'} for f in "$@"; do diff --git a/scripts/mk-pkg-add b/scripts/mk-pkg-add --- 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