diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | doc/ranger.1 | 4 | ||||
-rw-r--r-- | doc/ranger.pod | 2 | ||||
-rw-r--r-- | doc/release-checklist.txt | 27 | ||||
-rw-r--r-- | doc/screenshot.png | bin | 0 -> 55571 bytes | |||
-rw-r--r-- | ranger/config/rifle.conf | 1 | ||||
-rwxr-xr-x | ranger/ext/rifle.py | 7 | ||||
-rw-r--r-- | ranger/gui/widgets/console.py | 27 |
9 files changed, 57 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index 8c110f00..55687146 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.pyc *.pyo stuff/* +doc/ranger.1.html diff --git a/README.md b/README.md index a517add3..56565c46 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ minimalistic and nice curses interface with a view on the directory hierarchy. It ships with "rifle", a file launcher that is good at automatically finding out which program to use for what file type. +![screenshot](doc/screenshot.png) + This file describes ranger and how to get it to run. For instructions on the usage, please read the man page. See doc/HACKING for development specific information. For configuration, check the files in ranger/config/. They diff --git a/doc/ranger.1 b/doc/ranger.1 index ed94b064..2c19a1a5 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "RANGER 1" -.TH RANGER 1 "ranger-1.6.1" "08/26/2014" "ranger manual" +.TH RANGER 1 "ranger-1.6.1" "10/15/2014" "ranger manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -1201,6 +1201,8 @@ provided along with the source code. .IX Item "The project page: <http://ranger.nongnu.org/>" .IP "The mailing list: <http://savannah.nongnu.org/mail/?group=ranger>" 4 .IX Item "The mailing list: <http://savannah.nongnu.org/mail/?group=ranger>" +.IP "\s-1IRC\s0 channel: #ranger on freenode.net" 4 +.IX Item "IRC channel: #ranger on freenode.net" .PD .PP ranger is maintained with the git version control system. To fetch a fresh diff --git a/doc/ranger.pod b/doc/ranger.pod index 7662d26a..07c6a3bc 100644 --- a/doc/ranger.pod +++ b/doc/ranger.pod @@ -1311,6 +1311,8 @@ GNU General Public License 3 or (at your option) any later version. =item The mailing list: L<http://savannah.nongnu.org/mail/?group=ranger> +=item IRC channel: #ranger on freenode.net + =back ranger is maintained with the git version control system. To fetch a fresh diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt new file mode 100644 index 00000000..2ef99afe --- /dev/null +++ b/doc/release-checklist.txt @@ -0,0 +1,27 @@ +( ) test everything one last time: +( ) * make test +( ) * ./ranger.py [--clean] +( ) * ranger/ext/rifle.py +( ) * make install +( ) make a release commit: +( ) * update the number in the README +( ) * update the number in ranger/__init__.py +( ) * update the version number in ranger/ext/rifle.py +( ) * rebuild the man page with the updated number +( ) * write changelog entry +( ) * think of a witty commit message +( ) * change VERSION in ranger/__init__.py to something with "stable" +( ) * push the commit +( ) build .tar.gz with "make snapshot" +( ) make, make install and test the snapshot one last time +( ) update the website: +( ) * add the new version as ranger-stable.tar.gz +( ) * add the new version as ranger-X.Y.Z.tar.gz +( ) * update both signatures (gpg -sb <file>) +( ) * update the changelog +( ) * update the man page +( ) * rerun boobies.py +( ) announce the update +( ) * to the mailing list +( ) * in the arch linux forum +( ) * write a news entry on savannah diff --git a/doc/screenshot.png b/doc/screenshot.png new file mode 100644 index 00000000..42f13bcf --- /dev/null +++ b/doc/screenshot.png Binary files differdiff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf index c61abfee..4776cdf9 100644 --- a/ranger/config/rifle.conf +++ b/ranger/config/rifle.conf @@ -87,6 +87,7 @@ mime ^text, label pager = "$PAGER" -- "$@" ext 1 = man "$1" ext s[wmf]c, has zsnes, X = zsnes "$1" +ext s[wmf]c, has snes9x-gtk,X = snes9x-gtk "$1" ext nes, has fceux, X = fceux "$1" ext exe = wine "$1" name ^[mM]akefile$ = make diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py index 1cc2dcf8..4033d639 100755 --- a/ranger/ext/rifle.py +++ b/ranger/ext/rifle.py @@ -210,7 +210,12 @@ class Rifle(object): elif function == 'mime': return bool(re.search(argument, self._get_mimetype(files[0]))) elif function == 'has': - return argument in get_executables() + if argument.startswith("$"): + if argument[1:] in os.environ: + return os.environ[argument[1:]] in get_executables() + return False + else: + return argument in get_executables() elif function == 'terminal': return _is_terminal() elif function == 'number': diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index 91366e7c..8dd201e5 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -214,20 +214,23 @@ class Console(Widget): return unicode_buffer, line, pos if self.fm.py3: - unicode_buffer += key - try: - decoded = unicode_buffer.encode("latin-1").decode("utf-8") - except UnicodeDecodeError: - return unicode_buffer, line, pos - except UnicodeEncodeError: - return unicode_buffer, line, pos - else: + if len(unicode_buffer) >= 4: unicode_buffer = "" - if pos == len(line): - line += decoded + if ord(key) in range(0, 256): + unicode_buffer += key + try: + decoded = unicode_buffer.encode("latin-1").decode("utf-8") + except UnicodeDecodeError: + return unicode_buffer, line, pos + except UnicodeEncodeError: + return unicode_buffer, line, pos else: - line = line[:pos] + decoded + line[pos:] - pos += len(decoded) + unicode_buffer = "" + if pos == len(line): + line += decoded + else: + line = line[:pos] + decoded + line[pos:] + pos += len(decoded) else: if pos == len(line): line += key |