From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Michael Olbrich Date: Mon, 10 Oct 2011 18:04:56 +0200 Message-Id: <1318262696-584-1-git-send-email-m.olbrich@pengutronix.de> In-Reply-To: <1317833666-11917-1-git-send-email-andreas@biessmann.de> References: <1317833666-11917-1-git-send-email-andreas@biessmann.de> Subject: [ptxdist] [PATCH] libptxdist: explicitly use sed to run migrate_* Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Michael Olbrich this fixes migrate on systems where sed is not in /bin/ (e.g. OS X). Signed-off-by: Michael Olbrich --- Hi, what about this? It's less invasive than using autoconf. mol scripts/libptxdist.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index 48dbd64..4385566 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -156,12 +156,12 @@ ptxd_kconfig_migrate() { local part="${1}" local assistent="${PTX_MIGRATEDIR}/migrate_${part}" - if [ \! -x "${assistent}" ]; then + if [ \! -f "${assistent}" ]; then return 0 fi cp -- ".config" ".config.old" || return - "${assistent}" ".config.old" > ".config" + sed -f "${assistent}" ".config.old" > ".config" retval=$? if [ $retval -ne 0 ]; then -- 1.7.6.3 -- ptxdist mailing list ptxdist@pengutronix.de