fix nicos help
This commit is contained in:
7
base.py
7
base.py
@ -414,7 +414,8 @@ class ServiceManager:
|
|||||||
ins = None
|
ins = None
|
||||||
instances = self.wildcard(ins)
|
instances = self.wildcard(ins)
|
||||||
if instances is None:
|
if instances is None:
|
||||||
ins_set = {ins}
|
# ins_set = {ins}
|
||||||
|
ins_set = set(self.info)
|
||||||
else:
|
else:
|
||||||
ins_set = set(instances)
|
ins_set = set(instances)
|
||||||
cfginfo = {}
|
cfginfo = {}
|
||||||
@ -496,9 +497,9 @@ class ServiceManager:
|
|||||||
options['remark'] = ' '
|
options['remark'] = ' '
|
||||||
wildcards = False
|
wildcards = False
|
||||||
else:
|
else:
|
||||||
options['legend'] = ' [instance] is empty or one of %s\n' % ', '.join(self.info)
|
options['legend'] = ' [instance] is empty or one of %s\n' % ', '.join(self.info)
|
||||||
else:
|
else:
|
||||||
options['legend'] = ' <instance> is one of %s' % ', '.join(self.info)
|
options['legend'] = ' <instance> is one of %s\n' % ', '.join(self.info)
|
||||||
if wildcards:
|
if wildcards:
|
||||||
options['legend'] += " * wildcards allowed, using '.' to replace 0 or more arbitrary characters in <instance>\n"
|
options['legend'] += " * wildcards allowed, using '.' to replace 0 or more arbitrary characters in <instance>\n"
|
||||||
print(self.USAGE % options)
|
print(self.USAGE % options)
|
||||||
|
13
nicosman.py
13
nicosman.py
@ -55,17 +55,16 @@ class NicosManager(ServiceManager):
|
|||||||
Usage:
|
Usage:
|
||||||
|
|
||||||
nicos gui <instance>
|
nicos gui <instance>
|
||||||
nicos <instance> (the same as above)
|
nicos <instance> (the same as above)
|
||||||
nicos list [<instance>]
|
nicos list [<instance>]
|
||||||
nicos start <instance> [<service>] *
|
nicos start <instance> [<service>]
|
||||||
nicos restart <instance> [<service>] *
|
nicos restart <instance> [<service>] %(remark)s
|
||||||
nicos stop <instance> [<service>] *
|
nicos stop <instance> [<service>] %(remark)s
|
||||||
nicos create <instance> <nr> *
|
nicos create <instance> <nr>
|
||||||
nicos link <instance> (create links to nicos data and scripts)
|
nicos link <instance> (create links to nicos data and scripts)
|
||||||
|
|
||||||
<service> is one of cache, deamon, poller
|
<service> is one of cache, deamon, poller
|
||||||
%s
|
%(legend)s
|
||||||
* wildcards allowed, using '.' to replace 0 or more arbitrary characters in <instance>
|
|
||||||
|
|
||||||
to be done after the experiment:
|
to be done after the experiment:
|
||||||
nicos copy (copy data and scripts from link)
|
nicos copy (copy data and scripts from link)
|
||||||
|
Reference in New Issue
Block a user