bin/qcmd in qcmd-0.1.4 vs bin/qcmd in qcmd-0.1.5
- old
+ new
@@ -11,10 +11,11 @@
opt :debug, "Show full debug output, don't make changes to workspaces", :default => false
opt :machine, "Automatically try to connect to the machine with the given name", :type => :string
opt :machine_passcode, "Use the given machine passcode", :type => :integer
opt :workspace, "Automatically try to connect to the workspace with the given name", :type => :string
opt :workspace_passcode, "Use the given workspace passcode", :type => :integer
+ opt :command, "Execute a single command and exit", :type => :string
end
if opts[:verbose]
Qcmd.log_level = :debug
end
@@ -24,12 +25,22 @@
Qcmd.debug_mode = true
end
# browse local network and check for qlab + qlab workspaces
-Qcmd.ascii_qlab
-Qcmd.print
-Qcmd.print Qcmd.centered_text(VERSION_STRING)
+if !opts[:machine_given]
+ Qcmd.ascii_qlab
+ Qcmd.print
+ Qcmd.print Qcmd.centered_text(VERSION_STRING)
-Qcmd::Network.browse_and_display opts
+ Qcmd::Network.browse_and_display opts
+else
+ Qcmd::Network.browse
+end
+
+if options[:command_given] && !(options[:machine_given] && options[:workspace_given])
+ Qcmd.print_wrapped("if you give a command, you must also give a
+ machine name and a workspace name to connect to")
+end
+
Qcmd::CLI.launch opts