diff options
| author | hut <hut@lepus.uberspace.de> | 2015-02-17 23:29:38 +0100 |
|---|---|---|
| committer | hut <hut@lepus.uberspace.de> | 2015-02-17 23:42:30 +0100 |
| commit | 0970723c8f14bb8986d3bd7cce49cd0d7575d32b (patch) | |
| tree | 759990f3756bda06f14b99a364b0178ed50c6552 | |
| parent | 677c9ae868fcab6f97f964d59c6784398e08377b (diff) | |
| download | ranger-0970723c8f14bb8986d3bd7cce49cd0d7575d32b.tar.gz | |
core.fm: more sane --copy-config of commands.py
This commit makes ranger only copy a small sample commands.py to ~/.config/ranger/commands.py when running --copy-config=commands. The default commands.py will be copied to commands_full.py instead, a file that will not be loaded at all, and will only serve as a reference. It can be obtained with --copy-config=commands_full This will avoid that the average user's commands.py will break ranger whenever she's updating ranger after using --copy-config=all. It's necessary because commands.py contains much of the actual program logic, but it can't be kept compatible like other configuration files, and the user can't be expected to always keep an up-to-date version of it. Overview: Removed --copy-config rule: --copy-config=commands: commands.py -> commands.py New --copy-config rules: --copy-config=commands: commands_sample.py -> commands.py --copy-config=commands_full: commands.py -> commands_full.py
| -rw-r--r-- | ranger/core/fm.py | 6 | ||||
| -rw-r--r-- | ranger/core/main.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ranger/core/fm.py b/ranger/core/fm.py index eb99d1f1..22908f46 100644 --- a/ranger/core/fm.py +++ b/ranger/core/fm.py @@ -235,14 +235,16 @@ class FM(Actions, SignalDispatcher): if which == 'rifle' or which == 'all': copy('config/rifle.conf', 'rifle.conf') if which == 'commands' or which == 'all': - copy('config/commands.py', 'commands.py') + copy('config/commands_sample.py', 'commands.py') + if which == 'commands_full' or which == 'all': + copy('config/commands.py', 'commands_full.py') if which == 'rc' or which == 'all': copy('config/rc.conf', 'rc.conf') if which == 'scope' or which == 'all': copy('data/scope.sh', 'scope.sh') os.chmod(self.confpath('scope.sh'), os.stat(self.confpath('scope.sh')).st_mode | stat.S_IXUSR) - if which in ('all', 'rifle', 'scope', 'commands', 'rc'): + if which in ('all', 'rifle', 'scope', 'commands', 'commands_full', 'rc'): sys.stderr.write("\n> Please note that configuration files may " "change as ranger evolves.\n It's completely up to you to " "keep them up to date.\n") diff --git a/ranger/core/main.py b/ranger/core/main.py index 9ae8e0ff..9c9ee01b 100644 --- a/ranger/core/main.py +++ b/ranger/core/main.py @@ -193,7 +193,7 @@ def parse_arguments(): help="change the configuration directory. (%default)") parser.add_option('--copy-config', type='string', metavar='which', help="copy the default configs to the local config directory. " - "Possible values: all, rc, rifle, commands, scope") + "Possible values: all, rc, rifle, commands, commands_full, scope") parser.add_option('--fail-unless-cd', action='store_true', help=SUPPRESS_HELP) # COMPAT parser.add_option('-m', '--mode', type='int', default=0, metavar='n', |