Integrate local changes into git

[aids.git] / bin / aids

diff --git a/bin/aids b/bin/aids
index 5388ea942bba7414a2768b0930a6de3a332ad31c..d5869f788394a983907bb7cb4374f551d98d18ef 100755 (executable)
--- a/bin/aids
+++ b/bin/aids
@@ -1,6 +1,16 @@
 #!/usr/bin/ruby1.8
 
-require 'lib/aids'
+# Copyright (C) 2012  Steven McDonald <steven@steven-mcdonald.id.au>
+#
+# This program is free software. It comes without any warranty, to the
+# extent permitted by applicable law. You can redistribute it and/or
+# modify it under the terms of the Do What The Fuck You Want To Public
+# License, Version 2, as published by Sam Hocevar. See the file COPYING
+# in the root of this program's source distribution for details, or:
+#
+#   http://sam.zoy.org/wtfpl/COPYING
+
+require 'aids'
 
 def main(argv)
        svc = AIDS::Service.new(argv[1]) if argv[1]
@@ -23,9 +33,11 @@ def main(argv)
 end
 
 def display_status(svc)
-       print "#{svc.name[0..14]}:#{' ' * (16 - svc.name[0..14].length)}"
+       print "#{svc.name[0..14]}#{' ' * (16 - svc.name[0..14].length)}"
        status = svc.status
+       prettystatus = nil
        AIDS::RUNLEVEL_ALL.each do |r|
+               print "\t" if prettystatus
                case status[r]
                        when :start
                                prettystatus = 'on'
@@ -36,7 +48,7 @@ def display_status(svc)
                        else
                                next
                end
-                       print "#{r}: #{prettystatus + ' ' * (8 - prettystatus.length)}"
+                       print "#{r}:#{prettystatus}"
                end
        puts
 end