summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2012-02-12 17:12:28 +0100
committerhut <hut@lavabit.com>2012-02-12 17:12:28 +0100
commite748d5056c907c5f9e46f6824442d47231a1ad32 (patch)
tree7bae98c00cdf3a9ca46096b0845e37fc87692a32
parenta0cff8b77b3a81c84661e96a1efdd5bd5d6e6eac (diff)
downloadranger-e748d5056c907c5f9e46f6824442d47231a1ad32.tar.gz
core.main: Allow multiple --cmd's, add man page entry for --cmd
-rw-r--r--doc/ranger.16
-rw-r--r--doc/ranger.pod5
-rw-r--r--ranger/core/helper.py5
-rw-r--r--ranger/core/main.py3
4 files changed, 15 insertions, 4 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1
index 06b08d50..e58008e0 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.5.2" "10/24/2011" "ranger manual"
+.TH RANGER 1 "ranger-1.5.2" "02/12/2012" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -204,6 +204,10 @@ the execution of this file type is explicitly handled in the configuration.
 When a filename is supplied, run it with the given \fIflags\fR to modify
 behavior.  The execution of this file type is explicitly handled in the
 configuration.
+.IP "\fB\-\-cmd\fR=\fIcommand\fR" 14
+.IX Item "--cmd=command"
+Execute the command after the configuration has been read.  Use this option
+multiple times to run multiple commands.
 .IP "\fB\-\-version\fR" 14
 .IX Item "--version"
 Print the version and exit.
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 93b69999..0799f35d 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -99,6 +99,11 @@ When a filename is supplied, run it with the given I<flags> to modify
 behavior.  The execution of this file type is explicitly handled in the
 configuration.
 
+=item B<--cmd>=I<command>
+
+Execute the command after the configuration has been read.  Use this option
+multiple times to run multiple commands.
+
 =item B<--version>
 
 Print the version and exit.
diff --git a/ranger/core/helper.py b/ranger/core/helper.py
index 3f93e79c..c556b9bd 100644
--- a/ranger/core/helper.py
+++ b/ranger/core/helper.py
@@ -73,8 +73,9 @@ def parse_arguments():
 			help="List all files which are tagged with the given tag, default: *")
 	parser.add_option('--profile', action='store_true',
 			help="Print statistics of CPU usage on exit.")
-	parser.add_option('--cmd', type='string', metavar='COMMAND',
-			help="COMMAND will be executed after ranger has initialized")
+	parser.add_option('--cmd', action='append', type='string', metavar='COMMAND',
+			help="Execute COMMAND after the configuration has been read. "
+			"Use this option multiple times to run multiple commands.")
 
 	options, positional = parser.parse_args()
 	arg = OpenStruct(options.__dict__, targets=positional)
diff --git a/ranger/core/main.py b/ranger/core/main.py
index f80ee2d6..a17c6863 100644
--- a/ranger/core/main.py
+++ b/ranger/core/main.py
@@ -123,7 +123,8 @@ def main():
 		fm.ui.initialize()
 
 		if arg.cmd:
-			fm.execute_console(arg.cmd)
+			for command in arg.cmd:
+				fm.execute_console(command)
 
 		if ranger.arg.profile:
 			import cProfile