<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -288,10 +288,17 @@ end
 # Parse shell parameters
 options = {}
 opts = OptionParser.new do |opts|
-  opts.on &quot;start&quot; do
+  opts.on &quot;--start&quot; do
+    # Requested action: Start the ScopePort client.
     run
   end
 
+  opts.on &quot;--stop&quot; do
+    # Requested action: Stop the ScopePort client.
+    `killall scopeport-client`
+    exit
+  end
+
   opts.on &quot;-t&quot;, &quot;--test-sensors&quot; do
     # Requested action: Show all sensors with their values.
     sensor_names = Sensor::get_sensor_names
@@ -319,12 +326,16 @@ opts = OptionParser.new do |opts|
     puts &quot;== Configuration&quot;
     puts &quot;\t The configuration takes place in /etc/scopeport/scopeport-client.conf&quot;
     puts &quot;== Example&quot;
-    puts &quot;\t scopeport-client start&quot;
+    puts &quot;\t scopeport-client --start&quot;
     puts &quot;== Parameters&quot;
-    puts &quot;\t start/stop: Start or stop the client&quot;
+    puts &quot;\t --start: Start the client&quot;
+    puts &quot;\t --stop: Stop the client. Kills all scopeport-client processes on this machine&quot;
     puts &quot;\t -h, --help: Print this help message&quot;
     puts &quot;\t -t, --test-sensors: Print all sensors with their current value&quot;
     puts &quot;\t -v, --version: Print the version&quot;
     exit
   end
 end.parse!
+
+# This is shown if no matching command line parameter was given
+puts &quot;Usage: scopeport-client --start/--stop or --help for more information&quot;</diff>
      <filename>bin/scopeport-client</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1dda5bc9ff3f5c0aad0d429d20a68a4877f2aa5a</id>
    </parent>
  </parents>
  <author>
    <name>lennartkoopmann</name>
    <email>lennart@scopeport.org</email>
  </author>
  <url>http://github.com/lennartkoopmann/scopeport-client-ruby/commit/5e02a9ca3c960799e353da7db3655cbf25872df8</url>
  <id>5e02a9ca3c960799e353da7db3655cbf25872df8</id>
  <committed-date>2009-06-22T13:23:17-07:00</committed-date>
  <authored-date>2009-06-22T13:23:17-07:00</authored-date>
  <message>Completed start/stop methods</message>
  <tree>214c7caf5a69f908ee12fd2d254143ae19de4d2e</tree>
  <committer>
    <name>lennartkoopmann</name>
    <email>lennart@scopeport.org</email>
  </committer>
</commit>
