summaryrefslogtreecommitdiff
path: root/mailimport
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-09 22:42:07 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-09 22:42:07 -0300
commit06baaa0441c7fec2a211ddf7c502f837cd988132 (patch)
tree284236ae49b1385a091119cf7b3520bc7d64552a /mailimport
parente5561cf14fe189f7f0d726a1c66ffa992354ab2d (diff)
parentd784aba6717da44bfef18007146f6d00280e39fe (diff)
downloadmediapointer-dvb-s2-06baaa0441c7fec2a211ddf7c502f837cd988132.tar.gz
mediapointer-dvb-s2-06baaa0441c7fec2a211ddf7c502f837cd988132.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'mailimport')
-rwxr-xr-xmailimport20
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