threads / patch / 15357

patchdiffcol.sh: Use /bin/bash explicitly

Subject: [StGIT PATCH] diffcol.sh: Use /bin/bash explicitly

## tl;dr

3 messages between Sep 3, 2008 and Sep 5, 2008. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Shinya Kuribayashi· Sep 3, 2008, 15:47 UTC · lore

Recent Ubuntu uses dash (Debian Almquist Shell; a lightweight POSIX- compliant shell derived from ash) as /bin/sh by default. In this case pager=diffcol.sh doesn't work like this:

> skuribay@ubuntu:~/kernel/linux.git$ stg show
> /home/skuribay/share/stgit/contrib/diffcol.sh: 22: Bad substitution
this is caused by non-bash-compliant /bin/sh.

diffcol.sh is based on Quilt, and Quilt is dependent on bash; Actually all Quilt scripts use /bin/bash without exceptions. Then it's good for diffcol.sh to use /bin/bash.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---
 contrib/diffcol.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/diffcol.sh +1 −1
diff --git a/contrib/diffcol.sh b/contrib/diffcol.sh
index ea9109d..eecc87a 100755
--- a/contrib/diffcol.sh
+++ b/contrib/diffcol.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Code copied from Quilt (http://savannah.nongnu.org/projects/quilt)
 #
Karl Hasselström· Sep 3, 2008, 16:21 UTC · re: Shinya Kuribayashi · lore

Re: [StGIT PATCH] diffcol.sh: Use /bin/bash explicitly

On 2008-09-04 00:47:17 +0900, Shinya Kuribayashi wrote:
> diffcol.sh is based on Quilt, and Quilt is dependent on bash;
> Actually all Quilt scripts use /bin/bash without exceptions. Then
> it's good for diffcol.sh to use /bin/bash.

Thanks for this, and the other patch you sent. I'll be picking them up this weekend, unless Catalin beats me to it.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Catalin Marinas· Sep 5, 2008, 21:35 UTC · re: Karl Hasselström · lore

Re: [StGIT PATCH] diffcol.sh: Use /bin/bash explicitly

2008/9/3 Karl Hasselström <kha@treskal.com>:
Show 8 quoted lines
> On 2008-09-04 00:47:17 +0900, Shinya Kuribayashi wrote:
>
>> diffcol.sh is based on Quilt, and Quilt is dependent on bash;
>> Actually all Quilt scripts use /bin/bash without exceptions. Then
>> it's good for diffcol.sh to use /bin/bash.
>
> Thanks for this, and the other patch you sent. I'll be picking them up
> this weekend, unless Catalin beats me to it.

BTW, I think at some point we could change to using Git's native colouring. The diffcol.sh script is from the days when Git didn't have this feature. We currently generate a diff string and pass it through the pager but I'm not sure how to do this.

-- 
Catalin

← back to recent threads