update i3-sensible-* (Thanks Han)

diff --git a/debian/patches/manpage-x-terminal-emulator.patch b/debian/patches/manpage-x-terminal-emulator.patch
index 61ff016004f0e76825c7e6d1fda6fe188ad8fe1a..ed6cb465f542b1c1cf5b764513c76d56744f0be4 100644 (file)
--- a/debian/patches/manpage-x-terminal-emulator.patch
+++ b/debian/patches/manpage-x-terminal-emulator.patch
@@ -1,14 +1,12 @@
-## Description: Document Debian-specific x-terminal-emulator in the manpage.
-## Origin/Author: Michael Stapelberg
-Index: i3-4.1/man/i3-sensible-terminal.man
+Index: i3-4.1.1/man/i3-sensible-terminal.man

 ===================================================================
 ===================================================================

---- i3-4.1.orig/man/i3-sensible-terminal.man   2011-11-11 22:38:06.508025537 +0000
-+++ i3-4.1/man/i3-sensible-terminal.man        2011-11-11 22:38:04.752994892 +0000
+--- i3-4.1.1.orig/man/i3-sensible-terminal.man 2011-12-28 23:56:55.487581000 +0100
++++ i3-4.1.1/man/i3-sensible-terminal.man      2011-12-28 23:57:06.725802633 +0100

 @@ -22,6 +22,7 @@
  It tries to start one of the following (in that order):
  
  * $TERMINAL (this is a non-standard variable)
 @@ -22,6 +22,7 @@
  It tries to start one of the following (in that order):
  
  * $TERMINAL (this is a non-standard variable)

-+* x-terminal-emulator (only on Debian)
- * xterm
++* x-terminal-emulator

  * urxvt
  * rxvt
  * urxvt
  * rxvt

+ * terminator

diff --git a/debian/patches/use-x-terminal-emulator.patch b/debian/patches/use-x-terminal-emulator.patch
index 28e9200df49c85caf2fc785e62ffdef694f79cb8..0d71f7c4d3fe14f8dee694d500782ae12a7188eb 100644 (file)
--- a/debian/patches/use-x-terminal-emulator.patch
+++ b/debian/patches/use-x-terminal-emulator.patch
@@ -1,21 +1,17 @@
-## Description: Use Debian-specific x-terminal-emulator in i3-sensible-terminal
-## Origin/Author: Michael Stapelberg
---- a/i3-sensible-terminal.O   2011-11-11 22:03:52.414218386 +0000
-+++ b/i3-sensible-terminal     2011-11-11 22:04:38.372020210 +0000
-@@ -1,13 +1,11 @@
- #!/bin/sh
+Index: i3-4.1.1/i3-sensible-terminal
+===================================================================
+--- i3-4.1.1.orig/i3-sensible-terminal 2011-12-28 23:51:52.455610236 +0100
++++ i3-4.1.1/i3-sensible-terminal      2011-12-28 23:52:00.826775027 +0100
+@@ -4,11 +4,7 @@
+ #

  # This script tries to exec a terminal emulator by trying some known terminal
  # emulators.
 -#
 -# Distributions/packagers should enhance this script with a
 -# distribution-specific mechanism to find the preferred terminal emulator. On
 -# Debian, there is the x-terminal-emulator symlink for example.
  # This script tries to exec a terminal emulator by trying some known terminal
  # emulators.
 -#
 -# Distributions/packagers should enhance this script with a
 -# distribution-specific mechanism to find the preferred terminal emulator. On
 -# Debian, there is the x-terminal-emulator symlink for example.

--# Please don't touch the first line, though:
- [ -n "$TERMINAL" ] && which $TERMINAL >/dev/null && exec $TERMINAL "$@"
- 
-+# Debian-specific: use x-terminal-emulator
-+which x-terminal-emulator >/dev/null && exec x-terminal-emulator "$@"
-+
- # Hopefully one of these is installed:
- which xterm >/dev/null && exec xterm "$@"
- which urxvt >/dev/null && exec urxvt "$@"
+-for terminal in $TERMINAL urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm; do
++for terminal in $TERMINAL x-terminal-emulator urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm; do
+     if which $terminal > /dev/null 2>&1; then
+         exec $terminal "$@"
+     fi

diff --git a/i3-sensible-editor b/i3-sensible-editor
index d71a440bb1fe0c5c408ca8e18883f8ed114bb592..b3afceb7fa691ce3df5b8eeff19c97da48bdb4d3 100755 (executable)
--- a/i3-sensible-editor
+++ b/i3-sensible-editor
@@ -1,14 +1,16 @@
 #!/bin/sh
 #!/bin/sh

+#
+# This code is released in public domain by Han Boetes <han@mijncomputer.nl>
+#

 # This script tries to exec an editor by trying some known editors if $EDITOR is
 # not set.
 #
 # This script tries to exec an editor by trying some known editors if $EDITOR is
 # not set.
 #

-# Distributions/packagers can enhance this script with a
-# distribution-specific mechanism to find the preferred pager.
-[ -n "$VISUAL" ] && which $VISUAL >/dev/null && exec $VISUAL "$@"
-[ -n "$EDITOR" ] && which $EDITOR >/dev/null && exec $EDITOR "$@"
+# Distributions/packagers can enhance this script with a distribution-specific
+# mechanism to find the preferred editor

 
 # Hopefully one of these is installed (no flamewars about preference please!):
 
 # Hopefully one of these is installed (no flamewars about preference please!):

-which nano >/dev/null && exec nano "$@"
-which vim >/dev/null && exec vim "$@"
-which vi >/dev/null && exec vi "$@"
-which emacs >/dev/null && exec emacs "$@"
+for editor in $VISUAL $EDITOR nano vim vi emacs pico qe mg jed gedit mc-edit; do
+    if which $editor > /dev/null 2>&1; then
+        exec $editor "$@"
+    fi
+done

diff --git a/i3-sensible-pager b/i3-sensible-pager
index 32f30aff895e670d39a3755e07870bf287e5358f..df463251dffea61737ba9511e607f9cebb972d3b 100755 (executable)
--- a/i3-sensible-pager
+++ b/i3-sensible-pager
@@ -1,15 +1,18 @@
 #!/bin/sh
 #!/bin/sh

+#
+# This code is released in public domain by Han Boetes <han@mijncomputer.nl>
+

 # This script tries to exec a pager by trying some known pagers if $PAGER is
 # not set.
 #
 # Distributions/packagers can enhance this script with a
 # distribution-specific mechanism to find the preferred pager.
 # This script tries to exec a pager by trying some known pagers if $PAGER is
 # not set.
 #
 # Distributions/packagers can enhance this script with a
 # distribution-specific mechanism to find the preferred pager.

-[ -n "$PAGER" ] && which $PAGER >/dev/null && exec $PAGER "$@"
-
-# Hopefully one of these is installed:
-which most >/dev/null && exec most "$@"
-which less >/dev/null && exec less "$@"
-# we don't use 'more' because it will exit if the file is 'too short'

 
 

-# If no pager is installed, try an editor
-exec i3-sensible-editor "$@"
+# Hopefully one of these is installed (no flamewars about preference please!):
+# We don't use 'more' because it will exit if the file is too short.
+# Worst case scenario we'll open the file in your editor.
+for pager in $PAGER less most w3m i3-sensible-editor; do
+    if which $pager > /dev/null 2>&1; then
+        exec $pager "$@"
+    fi
+done

diff --git a/i3-sensible-terminal b/i3-sensible-terminal
index e5bf2718be1c3afa8623f6d3b577a6373bffad7b..a9975740864c07c51e2c18e1095f8eb43511ea65 100755 (executable)
--- a/i3-sensible-terminal
+++ b/i3-sensible-terminal
@@ -1,15 +1,15 @@
 #!/bin/sh
 #!/bin/sh

+#
+# This code is released in public domain by Han Boetes <han@mijncomputer.nl>
+#

 # This script tries to exec a terminal emulator by trying some known terminal
 # emulators.
 #
 # Distributions/packagers should enhance this script with a
 # distribution-specific mechanism to find the preferred terminal emulator. On
 # Debian, there is the x-terminal-emulator symlink for example.
 # This script tries to exec a terminal emulator by trying some known terminal
 # emulators.
 #
 # Distributions/packagers should enhance this script with a
 # distribution-specific mechanism to find the preferred terminal emulator. On
 # Debian, there is the x-terminal-emulator symlink for example.

-# Please don't touch the first line, though:
-[ -n "$TERMINAL" ] && which $TERMINAL >/dev/null && exec $TERMINAL "$@"
-
-# Hopefully one of these is installed:
-which xterm >/dev/null && exec xterm "$@"
-which urxvt >/dev/null && exec urxvt "$@"
-which rxvt >/dev/null && exec rxvt "$@"
-which roxterm >/dev/null && exec roxterm "$@"
+for terminal in $TERMINAL urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm; do
+    if which $terminal > /dev/null 2>&1; then
+        exec $terminal "$@"
+    fi
+done

diff --git a/man/i3-sensible-editor.man b/man/i3-sensible-editor.man
index 86fbf84058471a273fee7c74844fc34ea61712ba..2a0448813ecb48ecb97624cc4717b5df8f7ab540 100644 (file)
--- a/man/i3-sensible-editor.man
+++ b/man/i3-sensible-editor.man
@@ -23,6 +23,12 @@ It tries to start one of the following (in that order):
 * vim
 * vi
 * emacs
 * vim
 * vi
 * emacs

+* pico
+* qe
+* mg
+* jed
+* gedit
+* mc-edit

 
 Please don’t complain about the order: If the user has any preference, he will
 have $VISUAL or $EDITOR set.
 
 Please don’t complain about the order: If the user has any preference, he will
 have $VISUAL or $EDITOR set.

diff --git a/man/i3-sensible-pager.man b/man/i3-sensible-pager.man
index 73bd2fda74b59c829902ecd160a9e05702008e03..6b04c4316fda10d0f8fe7a1876ad356df1db5984 100644 (file)
--- a/man/i3-sensible-pager.man
+++ b/man/i3-sensible-pager.man
@@ -18,8 +18,9 @@ i3-sensible-pager is used by i3-nagbar(1) when you click on the view button.
 It tries to start one of the following (in that order):
 
 * $PAGER
 It tries to start one of the following (in that order):
 
 * $PAGER

-* most

 * less
 * less

+* most
+* w3m

 * i3-sensible-editor(1)
 
 Please don’t complain about the order: If the user has any preference, he will
 * i3-sensible-editor(1)
 
 Please don’t complain about the order: If the user has any preference, he will

diff --git a/man/i3-sensible-terminal.man b/man/i3-sensible-terminal.man
index 140e412bed1a2e9af146de711d31f04ab0a8144c..7e32aab4f0337d1580739e2fa6cd79965c56a47a 100644 (file)
--- a/man/i3-sensible-terminal.man
+++ b/man/i3-sensible-terminal.man
@@ -22,9 +22,13 @@ is appropriate for the distribution.
 It tries to start one of the following (in that order):
 
 * $TERMINAL (this is a non-standard variable)
 It tries to start one of the following (in that order):
 
 * $TERMINAL (this is a non-standard variable)

-* xterm

 * urxvt
 * rxvt
 * urxvt
 * rxvt

+* terminator
+* Eterm
+* aterm
+* xterm
+* gnome-terminal

 * roxterm
 
 Please don’t complain about the order: If the user has any preference, he will
 * roxterm
 
 Please don’t complain about the order: If the user has any preference, he will