diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-27 11:41:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-27 11:41:32 -0300 |
| commit | e8558b23c2907da5025c69968a2da368c3af2cd6 (patch) | |
| tree | 8470ec2481d547f2336a84e3984758f0f6941cc7 /mailimport | |
| parent | b958baf0ee13fa0e4472567f64ee943deb16d044 (diff) | |
| parent | b171b4bf6091c1b3482b7ac3c14e1672f10c6950 (diff) | |
| download | mediapointer-dvb-s2-e8558b23c2907da5025c69968a2da368c3af2cd6.tar.gz mediapointer-dvb-s2-e8558b23c2907da5025c69968a2da368c3af2cd6.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/cx23885-417
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'mailimport')
| -rwxr-xr-x | mailimport | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/mailimport b/mailimport index 76364aeea..bd6d36c2e 100755 --- a/mailimport +++ b/mailimport @@ -34,7 +34,7 @@ edit_patch() mv $tmp/$newfile $next; fi echo Editing $next - $EDITOR $next + $ED $next } #################################################################### @@ -80,7 +80,7 @@ apply_patch () { if [ "`grep '^Bad:' $TMP2`" != "" ]; then echo "*** ERROR: Patch bad formed. Please fix." sleep 1 - $EDITOR $next + $ED $next cont=1 fi done @@ -214,8 +214,20 @@ if [ "$TMPDIR" == "" ]; then TMPDIR=/tmp fi -if [ "$EDITOR" == "" ]; then - EDITOR="nano -w" +if [ "`which editdiff`" != "" ]; then + ED="editdiff" +else + ED=$EDITOR +fi + +if [ "$ED" == "" ]; then + if [ "`which nano`" != "" ]; then + ED="nano -w" + elif [ "`which pico`" != "" ]; then + ED="pico -w" + else + ED="vi" + fi fi if [ "$CHECKPATCH" == "" ]; then |