From 17fff39348d1797e7b0fc3ab1589a60546785f1d Mon Sep 17 00:00:00 2001 From: hut Date: Thu, 24 Jun 2010 20:32:46 +0200 Subject: README: formatting, cleanup --- README | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README') diff --git a/README b/README index 562dfbdf..ee8b40d6 100644 --- a/README +++ b/README @@ -5,9 +5,10 @@ Ranger is a free console file manager that gives you greater flexibility and a good overview of your files without having to leave your *nix console. It visualizes the directory tree in two dimensions: the directory hierarchy on one, lists of files on the other, with a preview to the right so you know -where you'll be going. The default keys are similar to those of Vim, Emacs -and Midnight Commander, though Ranger is easily controllable with just the -arrow keys or the mouse. +where you'll be going. + +The default keys are similar to those of Vim, Emacs and Midnight Commander, +though Ranger is easily controllable with just the arrow keys or the mouse. The program is written in Python (2.6 or 3.1) and uses curses for the text-based user interface. @@ -19,7 +20,6 @@ About * Author: Roman Zimbelmann * Website: http://savannah.nongnu.org/projects/ranger * License: GNU General Public License Version 3 -* Version: 1.1.1 * Download URL of the newest stable version: http://git.savannah.gnu.org/cgit/ranger.git/snapshot/ranger-stable.tar.gz -- cgit 1.4.1-2-gfad0 From 20ab9343ae45320eb29f96ddb66b30148be2aa7f Mon Sep 17 00:00:00 2001 From: hut Date: Thu, 24 Jun 2010 20:33:05 +0200 Subject: README: added design goals section --- README | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'README') diff --git a/README b/README index ee8b40d6..120e7860 100644 --- a/README +++ b/README @@ -28,6 +28,15 @@ http://git.savannah.gnu.org/cgit/ranger.git/snapshot/ranger-stable.tar.gz git clone http://git.sv.gnu.org/r/ranger.git +Design Goals +------------ + +* An easily maintainable file manager in a high level language +* A quick way to switch directories and browse the file system +* Keep it small but useful, do one thing and do it well +* Console based, with smooth integration into the unix shell + + Features -------- -- cgit 1.4.1-2-gfad0 From 9001827456388e40f36393a9f44d6361e53210ed Mon Sep 17 00:00:00 2001 From: hut Date: Mon, 12 Jul 2010 20:09:58 +0200 Subject: Why did the astrophysicist order three hamburgers? --- CHANGELOG | 6 ++++++ README | 2 +- doc/ranger.1 | 2 +- ranger/__init__.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'README') diff --git a/CHANGELOG b/CHANGELOG index 578717d4..3b2ee97a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +1.1.1 -> 1.1.2: +* Fix crash when using scrollwheel to scroll down in some cases +* The command "ranger dir1 dir2 ..." opens multiple directories in tabs +* Removed pydoc html documentation by default, re-create it with "make doc" +* Minor fixes + 1.1.0 -> 1.1.1: * New install script, "setup.py" * New flag for running programs: "w" (waits for enter press) diff --git a/README b/README index 120e7860..dad70262 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Ranger v.1.1.1 +Ranger v.1.1.2 ============== Ranger is a free console file manager that gives you greater flexibility diff --git a/doc/ranger.1 b/doc/ranger.1 index dd343f28..3db90285 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -1,4 +1,4 @@ -.TH RANGER 1 ranger-1.1.1 +.TH RANGER 1 ranger-1.1.2 .SH NAME ranger - visual file manager .\"----------------------------------------- diff --git a/ranger/__init__.py b/ranger/__init__.py index 4fcc2ecf..e0e8e1bf 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -20,7 +20,7 @@ import sys from ranger.ext.openstruct import OpenStruct __license__ = 'GPL3' -__version__ = '1.1.1' +__version__ = '1.1.2' __credits__ = 'Roman Zimbelmann' __author__ = 'Roman Zimbelmann' __maintainer__ = 'Roman Zimbelmann' -- cgit 1.4.1-2-gfad0 From a2853ab67f2e471d9a34b4c528db6ee2024ef874 Mon Sep 17 00:00:00 2001 From: hut Date: Sat, 28 Aug 2010 08:30:52 +0200 Subject: Changed default config dir to $XDG_CONFIG_HOME/ranger --- HACKING | 4 ++-- README | 2 +- doc/colorschemes.txt | 4 ++-- doc/ranger.1 | 9 +++++---- ranger.py | 6 +++++- ranger/__init__.py | 5 ++++- ranger/__main__.py | 2 +- ranger/core/actions.py | 2 +- ranger/defaults/apps.py | 4 ++-- ranger/defaults/commands.py | 2 +- ranger/defaults/keys.py | 2 +- ranger/defaults/options.py | 2 +- ranger/gui/colorscheme.py | 6 +++--- 13 files changed, 29 insertions(+), 21 deletions(-) (limited to 'README') diff --git a/HACKING b/HACKING index 9c114e89..0424b047 100644 --- a/HACKING +++ b/HACKING @@ -56,13 +56,13 @@ assuming is a "SettingsAware" object. * Changing commands, adding aliases: ranger/defaults/commands.py -or ~/.ranger/commands.py +or ~/.config/ranger/commands.py * Adding colorschemes: Copy ranger/colorschemes/default.py to ranger/colorschemes/myscheme.py and modify it according to your needs. Alternatively, mimic the jungle colorscheme. It subclasses the default scheme and just modifies a few things. -In ranger/defaults/options.py (or ~/.ranger/options.py), change +In ranger/defaults/options.py (or ~/.config/ranger/options.py), change colorscheme = 'default' to: colorscheme = 'myscheme' diff --git a/README b/README index dad70262..babcfbbb 100644 --- a/README +++ b/README @@ -75,7 +75,7 @@ parent directories and to the right there's a preview of the object you're pointing at. Now use the Arrow Keys to navigate, Enter to open a file or type Q to quit. -To customize ranger, copy the files from ranger/defaults/ to ~/.ranger/ +To customize ranger, copy the files from ranger/defaults/ to ~/.config/ranger/ and modify them according to your wishes. diff --git a/doc/colorschemes.txt b/doc/colorschemes.txt index 905c7a3e..e7bc2c0a 100644 --- a/doc/colorschemes.txt +++ b/doc/colorschemes.txt @@ -65,7 +65,7 @@ Specify a Colorscheme --------------------- Colorschemes are searched for in these directories: -~/.ranger/colorschemes/ +~/.config/ranger/colorschemes/ /ranger/colorschemes/ To specify which colorscheme to use, define the variable "colorscheme" @@ -73,7 +73,7 @@ in your options.py: colorscheme = colorschemes.default This means, use the (one) colorscheme contained in -either ~/.ranger/colorschemes/default.py or /ranger/colorschemes/default.py. +either ~/.config/ranger/colorschemes/default.py or /ranger/colorschemes/default.py. You can define more than one colorscheme in a colorscheme file. The one named "Scheme" will be chosen in that case. If there is no colorscheme diff --git a/doc/ranger.1 b/doc/ranger.1 index 3db90285..fab42496 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -38,7 +38,8 @@ Return the exit code 1 if ranger is used to run a file, for example with `ranger --fail-unless-cd filename`. This can be useful for scripts. .TP -r \fIdir\fR, --confdir=\fIdir\fR -Define a different configuration directory. The default is $HOME/.ranger. +Define a different configuration directory. The default is +$XDG_CONFIG_HOME/ranger (which defaults to ~/.config/ranger) .TP -m \fIn\fR, --mode=\fIn\fR When a filename is supplied, make it run in mode \fIn\fR. Check the @@ -177,17 +178,17 @@ of your parent shell after exiting ranger: ranger() { command ranger --fail-unless-cd $@ && - cd "$(grep \\^\\' ~/.ranger/bookmarks | cut -b3-)" + cd "$(grep \\^\\' ~/.config/ranger/bookmarks | cut -b3-)" } .\"----------------------------------------- .SH CONFIGURATION The files in .B ranger/defaults/ can be copied into your configuration directory (by default, this is -$HOME/.ranger) and customized according to your wishes. +~/.config/ranger) and customized according to your wishes. Most files don't have to be copied completely though: Just define those settings you want to add or change and they will override the defauls. -Colorschemes can be placed in $HOME/.ranger/colorschemes. +Colorschemes can be placed in ~/.config/ranger/colorschemes. .P All configuration is done in Python. Each configuration file should contain sufficient documentation. diff --git a/ranger.py b/ranger.py index f290d796..cc7f14ed 100755 --- a/ranger.py +++ b/ranger.py @@ -23,7 +23,11 @@ # after you exit ranger by starting it with: source ranger ranger """": if [ $1 ]; then - $@ --fail-unless-cd && cd "$(grep \^\' ~/.ranger/bookmarks | cut -b3-)" + if [ -z $XDG_CONFIG_HOME ]; then + $@ --fail-unless-cd && cd "$(grep \^\' ~/.config/ranger/bookmarks | cut -b3-)" + else + $@ --fail-unless-cd && cd "$(grep \^\' "$XDG_CONFIG_HOME"/ranger/bookmarks | cut -b3-)" + fi else echo "usage: source path/to/ranger.py path/to/ranger.py" fi diff --git a/ranger/__init__.py b/ranger/__init__.py index e0e8e1bf..57e0e5a2 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -31,7 +31,10 @@ Copyright (C) 2009, 2010 Roman Zimbelmann """ USAGE = '%prog [options] [path/filename]' -DEFAULT_CONFDIR = '~/.ranger' +if 'XDG_CONFIG_HOME' in os.environ and os.environ['XDG_CONFIG_HOME']: + DEFAULT_CONFDIR = os.environ['XDG_CONFIG_HOME'] + '/ranger' +else: + DEFAULT_CONFDIR = '~/.config/ranger' RANGERDIR = os.path.dirname(__file__) LOGFILE = '/tmp/errorlog' arg = OpenStruct( diff --git a/ranger/__main__.py b/ranger/__main__.py index b3a41776..28284ef5 100644 --- a/ranger/__main__.py +++ b/ranger/__main__.py @@ -113,7 +113,7 @@ def load_settings(fm, clean): pass # COMPAT WARNING if hasattr(keys, 'initialize_commands'): - print("Warning: the syntax for ~/.ranger/keys.py has changed.") + print("Warning: the syntax for ~/.config/ranger/keys.py has changed.") print("Your custom keys are not loaded."\ " Please update your configuration.") allow_access_to_confdir(ranger.arg.confdir, False) diff --git a/ranger/core/actions.py b/ranger/core/actions.py index d12d9c6c..a5ee0d4d 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -423,7 +423,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): # -------------------------- # -- Tags # -------------------------- - # Tags are saved in ~/.ranger/tagged and simply mark if a + # Tags are saved in ~/.config/ranger/tagged and simply mark if a # file is important to you in any context. def tag_toggle(self, movedown=None): diff --git a/ranger/defaults/apps.py b/ranger/defaults/apps.py index 48735196..47eff0c9 100644 --- a/ranger/defaults/apps.py +++ b/ranger/defaults/apps.py @@ -17,13 +17,13 @@ This is the default ranger configuration file for filetype detection and application handling. -You can place this file in your ~/.ranger/ directory and it will be used +You can place this file in your ~/.config/ranger/ directory and it will be used instead of this one. Though, to minimize your effort when upgrading ranger, you may want to subclass CustomApplications rather than making a full copy. This example modifies the behaviour of "feh" and adds a custom media player: -#### start of the ~/.ranger/apps.py example +#### start of the ~/.config/ranger/apps.py example from ranger.defaults.apps import CustomApplications as DefaultApps from ranger.api.apps import * diff --git a/ranger/defaults/commands.py b/ranger/defaults/commands.py index f1c92274..b6bf7e2b 100644 --- a/ranger/defaults/commands.py +++ b/ranger/defaults/commands.py @@ -32,7 +32,7 @@ The return value for quick() can be: The return value for execute() doesn't matter. If you want to add custom commands, you can create a file -~/.ranger/commands.py, add the line: +~/.config/ranger/commands.py, add the line: from ranger.api.commands import * and write some command definitions, for example: diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py index e72f4c91..7d8ccc4a 100644 --- a/ranger/defaults/keys.py +++ b/ranger/defaults/keys.py @@ -58,7 +58,7 @@ dgg => fm.cut(foo=bar, dirarg=Direction(to=0)) 5dgg => fm.cut(foo=bar, narg=5, dirarg=Direction(to=0)) 5d3gg => fm.cut(foo=bar, narg=5, dirarg=Direction(to=3)) -Example ~/.ranger/keys.py +Example ~/.config/ranger/keys.py ------------------------- from ranger.api.keys import * diff --git a/ranger/defaults/options.py b/ranger/defaults/options.py index d3c420af..126d4bad 100644 --- a/ranger/defaults/options.py +++ b/ranger/defaults/options.py @@ -17,7 +17,7 @@ This is the default configuration file of ranger. There are two ways of customizing ranger. The first and recommended -method is creating a file at ~/.ranger/options.py and adding +method is creating a file at ~/.config/ranger/options.py and adding those lines you want to change. It might look like this: from ranger.api.options import * diff --git a/ranger/gui/colorscheme.py b/ranger/gui/colorscheme.py index 501b8788..5b317acb 100644 --- a/ranger/gui/colorscheme.py +++ b/ranger/gui/colorscheme.py @@ -24,7 +24,7 @@ The values are specified in ranger.gui.color. A colorscheme must... 1. be inside either of these directories: -~/.ranger/colorschemes/ +~/.config/ranger/colorschemes/ path/to/ranger/colorschemes/ 2. be a subclass of ranger.gui.colorscheme.ColorScheme @@ -121,7 +121,7 @@ class ColorScheme(SettingsAware): return fg, -1, attr def _colorscheme_name_to_class(signal): - # Find the colorscheme. First look for it at ~/.ranger/colorschemes, + # Find the colorscheme. First look for it at ~/.config/ranger/colorschemes, # then at RANGERDIR/colorschemes. If the file contains a class # named Scheme, it is used. Otherwise, an arbitrary other class # is picked. @@ -139,7 +139,7 @@ def _colorscheme_name_to_class(signal): except: return False - # create ~/.ranger/colorschemes/__init__.py if it doesn't exist + # create ~/.config/ranger/colorschemes/__init__.py if it doesn't exist if usecustom: if os.path.exists(ranger.relpath_conf('colorschemes')): initpy = ranger.relpath_conf('colorschemes', '__init__.py') -- cgit 1.4.1-2-gfad0 From 0df1d653deb7a9a8ca30f012475891e339b4449f Mon Sep 17 00:00:00 2001 From: hut Date: Sat, 28 Aug 2010 21:27:43 +0200 Subject: Changed version number to 1.2 (testing) to adhere with versioning scheme --- HACKING | 2 +- README | 4 ++-- doc/ranger.1 | 2 +- ranger/__init__.py | 2 +- ranger/__main__.py | 9 ++++++++- 5 files changed, 13 insertions(+), 6 deletions(-) (limited to 'README') diff --git a/HACKING b/HACKING index 0424b047..1794c8e5 100644 --- a/HACKING +++ b/HACKING @@ -92,4 +92,4 @@ X.Y.Z, where: * X: Major version, milestone * Y: Minor version, odd number => stable version -* Z: Revision +* Z: Revision, may be omitted if zero diff --git a/README b/README index babcfbbb..912b8718 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Ranger v.1.1.2 -============== +Ranger v.1.2 +============ Ranger is a free console file manager that gives you greater flexibility and a good overview of your files without having to leave your *nix console. diff --git a/doc/ranger.1 b/doc/ranger.1 index fab42496..10f78d47 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -1,4 +1,4 @@ -.TH RANGER 1 ranger-1.1.2 +.TH RANGER 1 ranger-1.2 .SH NAME ranger - visual file manager .\"----------------------------------------- diff --git a/ranger/__init__.py b/ranger/__init__.py index 57e0e5a2..282fd2b1 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -20,7 +20,7 @@ import sys from ranger.ext.openstruct import OpenStruct __license__ = 'GPL3' -__version__ = '1.1.2' +__version__ = '1.2' __credits__ = 'Roman Zimbelmann' __author__ = 'Roman Zimbelmann' __maintainer__ = 'Roman Zimbelmann' diff --git a/ranger/__main__.py b/ranger/__main__.py index 28284ef5..5a8411d6 100644 --- a/ranger/__main__.py +++ b/ranger/__main__.py @@ -30,7 +30,14 @@ def parse_arguments(): from optparse import OptionParser, SUPPRESS_HELP from ranger import __version__, USAGE, DEFAULT_CONFDIR from ranger.ext.openstruct import OpenStruct - parser = OptionParser(usage=USAGE, version='ranger ' + __version__) + + minor_version = __version__[2:] # assumes major version number is <10 + if '.' in minor_version: + minor_version = minor_version[:minor_version.find('.')] + version_tag = ' (stable)' if int(minor_version) % 2 == 1 else ' (testing)' + version_string = 'ranger ' + __version__ + version_tag + + parser = OptionParser(usage=USAGE, version=version_string) parser.add_option('-d', '--debug', action='store_true', help="activate debug mode") -- cgit 1.4.1-2-gfad0 From fd29d7e6bb22d6176717ac5dc9e3c8f88009732b Mon Sep 17 00:00:00 2001 From: hut Date: Sat, 28 Aug 2010 22:36:48 +0200 Subject: Tuned versioning scheme to be more intuitive, back to 1.1.2 --- HACKING | 2 +- README | 4 ++-- doc/ranger.1 | 2 +- ranger/__init__.py | 2 +- ranger/__main__.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'README') diff --git a/HACKING b/HACKING index 1794c8e5..dd384758 100644 --- a/HACKING +++ b/HACKING @@ -91,5 +91,5 @@ Version Numbering X.Y.Z, where: * X: Major version, milestone -* Y: Minor version, odd number => stable version +* Y: Minor version, even number => stable version * Z: Revision, may be omitted if zero diff --git a/README b/README index 912b8718..babcfbbb 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Ranger v.1.2 -============ +Ranger v.1.1.2 +============== Ranger is a free console file manager that gives you greater flexibility and a good overview of your files without having to leave your *nix console. diff --git a/doc/ranger.1 b/doc/ranger.1 index 10f78d47..fab42496 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -1,4 +1,4 @@ -.TH RANGER 1 ranger-1.2 +.TH RANGER 1 ranger-1.1.2 .SH NAME ranger - visual file manager .\"----------------------------------------- diff --git a/ranger/__init__.py b/ranger/__init__.py index 282fd2b1..57e0e5a2 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -20,7 +20,7 @@ import sys from ranger.ext.openstruct import OpenStruct __license__ = 'GPL3' -__version__ = '1.2' +__version__ = '1.1.2' __credits__ = 'Roman Zimbelmann' __author__ = 'Roman Zimbelmann' __maintainer__ = 'Roman Zimbelmann' diff --git a/ranger/__main__.py b/ranger/__main__.py index 5a8411d6..39e7f1f3 100644 --- a/ranger/__main__.py +++ b/ranger/__main__.py @@ -34,7 +34,7 @@ def parse_arguments(): minor_version = __version__[2:] # assumes major version number is <10 if '.' in minor_version: minor_version = minor_version[:minor_version.find('.')] - version_tag = ' (stable)' if int(minor_version) % 2 == 1 else ' (testing)' + version_tag = ' (stable)' if int(minor_version) % 2 == 0 else ' (testing)' version_string = 'ranger ' + __version__ + version_tag parser = OptionParser(usage=USAGE, version=version_string) -- cgit 1.4.1-2-gfad0 From 547173247b8ce5dc40fa4f8b9fcf822270661c0f Mon Sep 17 00:00:00 2001 From: hut Date: Sat, 11 Sep 2010 20:49:05 +0200 Subject: README: added ranger starting function example --- README | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'README') diff --git a/README b/README index babcfbbb..80331dcb 100644 --- a/README +++ b/README @@ -78,6 +78,20 @@ or type Q to quit. To customize ranger, copy the files from ranger/defaults/ to ~/.config/ranger/ and modify them according to your wishes. +The author of ranger uses this function (in ~/.bashrc) to start ranger: +function ranger-cd { + before="$(pwd)" + python2.6 /the/path/to/ranger/ranger.py --fail-unless-cd "$@" || return 0 + after="$(grep \^\' ~/.config/ranger/bookmarks | cut -b3-)" + if [[ "$before" != "$after" ]]; then + cd "$after" + fi +} +bind '"\C-o":"ranger-cd\C-m"' + +This changes the directory after you close ranger and adds the shortcut + for starting ranger. + Troubleshooting, Getting Help ----------------------------- -- cgit 1.4.1-2-gfad0 From 6df94b8b2ae44d3c44558204ba7483775f230d12 Mon Sep 17 00:00:00 2001 From: hut Date: Mon, 13 Sep 2010 12:49:28 +0200 Subject: README: Usage Tips section --- README | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'README') diff --git a/README b/README index 80331dcb..4fd9876f 100644 --- a/README +++ b/README @@ -78,6 +78,10 @@ or type Q to quit. To customize ranger, copy the files from ranger/defaults/ to ~/.config/ranger/ and modify them according to your wishes. + +Usage Tips +---------- + The author of ranger uses this function (in ~/.bashrc) to start ranger: function ranger-cd { before="$(pwd)" @@ -92,6 +96,8 @@ bind '"\C-o":"ranger-cd\C-m"' This changes the directory after you close ranger and adds the shortcut for starting ranger. +To change back to the previous directory, you can type: cd - + Troubleshooting, Getting Help ----------------------------- -- cgit 1.4.1-2-gfad0 From 81f5ac9e8b9dbcbccbd01ad8f046ccf26fb53430 Mon Sep 17 00:00:00 2001 From: hut Date: Mon, 13 Sep 2010 13:06:48 +0200 Subject: Beware of low-flying butterflies --- CHANGELOG | 18 ++++++++++++++++++ README | 2 +- doc/ranger.1 | 2 +- ranger/__init__.py | 2 +- ranger/__main__.py | 5 ++++- 5 files changed, 25 insertions(+), 4 deletions(-) (limited to 'README') diff --git a/CHANGELOG b/CHANGELOG index 3b2ee97a..f1417fee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,21 @@ +This log only documents changes between stable versions. + +From 1.2 on, odd minor version numbers (1.3, 1.5, 1.7,..) are assigned to the +fresh git snapshots while stable versions will have even minor numbers. + +1.1.2 -> 1.2: +* !!! Changed the default configuration directory to ~/.config/ranger !!! +* Removed "Console Modes", each old mode is now a simple command +* Disabled file previews by default if ranger is used by root +* Allow to jump to specific help sections by typing two numbers, e.g. 13? +* Added keys: da, dr, ya, yr for adding and removing files from copy buffer +* Added keys: gl and gL to resolve links, see 11? +* Added key: pL to create a relative symlink +* Added % and % macros for the console, see 33? +* Fixed ansi codes for colors in the pager +* Use the file ~/.mime.types for mime type detection +* Several clean-ups and fixes + 1.1.1 -> 1.1.2: * Fix crash when using scrollwheel to scroll down in some cases * The command "ranger dir1 dir2 ..." opens multiple directories in tabs diff --git a/README b/README index 4fd9876f..85b7e857 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Ranger v.1.1.2 +Ranger v.1.2.0 ============== Ranger is a free console file manager that gives you greater flexibility diff --git a/doc/ranger.1 b/doc/ranger.1 index fab42496..d81db6d4 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -1,4 +1,4 @@ -.TH RANGER 1 ranger-1.1.2 +.TH RANGER 1 ranger-1.2.0 .SH NAME ranger - visual file manager .\"----------------------------------------- diff --git a/ranger/__init__.py b/ranger/__init__.py index 57e0e5a2..c2a695c9 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -20,7 +20,7 @@ import sys from ranger.ext.openstruct import OpenStruct __license__ = 'GPL3' -__version__ = '1.1.2' +__version__ = '1.2.0' __credits__ = 'Roman Zimbelmann' __author__ = 'Roman Zimbelmann' __maintainer__ = 'Roman Zimbelmann' diff --git a/ranger/__main__.py b/ranger/__main__.py index 7db82a57..0ded8c95 100644 --- a/ranger/__main__.py +++ b/ranger/__main__.py @@ -35,7 +35,10 @@ def parse_arguments(): if '.' in minor_version: minor_version = minor_version[:minor_version.find('.')] version_tag = ' (stable)' if int(minor_version) % 2 == 0 else ' (testing)' - version_string = 'ranger ' + __version__ + version_tag + if __version__.endswith('.0'): + version_string = 'ranger ' + __version__[:-2] + version_tag + else: + version_string = 'ranger ' + __version__ + version_tag parser = OptionParser(usage=USAGE, version=version_string) -- cgit 1.4.1-2-gfad0 From ddc294bf3ab0f12e956496f23f51609ce343dda6 Mon Sep 17 00:00:00 2001 From: hut Date: Thu, 16 Sep 2010 17:46:33 +0200 Subject: core.actions: Fixed yy/pp bug when yanking multiple directories --- README | 2 +- doc/ranger.1 | 2 +- ranger/__init__.py | 2 +- ranger/core/actions.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'README') diff --git a/README b/README index 85b7e857..f0ee7a06 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Ranger v.1.2.0 +Ranger v.1.2.1 ============== Ranger is a free console file manager that gives you greater flexibility diff --git a/doc/ranger.1 b/doc/ranger.1 index d81db6d4..03cc3d56 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -1,4 +1,4 @@ -.TH RANGER 1 ranger-1.2.0 +.TH RANGER 1 ranger-1.2.1 .SH NAME ranger - visual file manager .\"----------------------------------------- diff --git a/ranger/__init__.py b/ranger/__init__.py index c2a695c9..4f223b7d 100644 --- a/ranger/__init__.py +++ b/ranger/__init__.py @@ -20,7 +20,7 @@ import sys from ranger.ext.openstruct import OpenStruct __license__ = 'GPL3' -__version__ = '1.2.0' +__version__ = '1.2.1' __credits__ = 'Roman Zimbelmann' __author__ = 'Roman Zimbelmann' __maintainer__ = 'Roman Zimbelmann' diff --git a/ranger/core/actions.py b/ranger/core/actions.py index a93344a4..b88849ef 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -709,7 +709,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): for f in self.env.copy: if isdir(f.path): for _ in shutil_g.copytree(src=f.path, - dst=join(self.env.cwd.path, f.basename), + dst=join(original_path, f.basename), symlinks=True, overwrite=overwrite): yield -- cgit 1.4.1-2-gfad0