lkml.org 
[lkml]   [2010]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] scripts: decodecode: use /bin/bash
On Thu, Jun 03, 2010 at 09:24:58AM -0700, Randy Dunlap wrote:
> On Thu, 3 Jun 2010 21:44:46 +0530 Rabin Vincent wrote:
>
> > 5358db ("scripts: add ARM support to decodecode") added a few bashims to
> > the decodecode script, so explicitly ask for bash.
> >
> > Signed-off-by: Rabin Vincent <rabin@rab.in>
> > ---
> > Alternatively, I have a patch to remove the bashisms, if that's preferred.
>
> Yes, that's what we usually prefer to do.
> Please post it.

Here it is:

From f729122bcd237f32c9f667e5644c6114ddc795af Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Thu, 3 Jun 2010 21:33:46 +0530
Subject: [PATCH] scripts: decodecode: remove bashisms

Remove bashisms to make scripts/decodecode work with other shells.

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
scripts/decodecode | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/decodecode b/scripts/decodecode
index 8b30cc3..18ba881 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -40,7 +40,7 @@ echo $code
code=`echo $code | sed -e 's/.*Code: //'`

width=`expr index "$code" ' '`
-width=$[($width-1)/2]
+width=$((($width-1)/2))
case $width in
1) type=byte ;;
2) type=2byte ;;
@@ -48,10 +48,10 @@ case $width in
esac

disas() {
- ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s &> /dev/null
+ ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1

- if [ "$ARCH" == "arm" ]; then
- if [ $width == 2 ]; then
+ if [ "$ARCH" = "arm" ]; then
+ if [ $width -eq 2 ]; then
OBJDUMPFLAGS="-M force-thumb"
fi

@@ -59,7 +59,7 @@ disas() {
fi

${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \
- grep -v "/tmp\|Disassembly\|\.text\|^$" &> $1.dis
+ grep -v "/tmp\|Disassembly\|\.text\|^$" > $1.dis 2>&1
}

marker=`expr index "$code" "\<"`
--
1.7.1


\
 
 \ /
  Last update: 2010-06-03 19:21    [W:0.073 / U:0.788 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site