fix issues with auto detection args

+ treat develop cfg correctly
This commit is contained in:
2022-04-20 16:09:37 +02:00
parent 247e660717
commit 4e58fb463f
2 changed files with 22 additions and 10 deletions

View File

@@ -50,10 +50,6 @@ class SewebManager(ServiceManager):
all = NicosManager, FrappyManager, SeaManager, SewebManager
ACTION = 1
INS = 2
SERVICE = 3
def run(group, arglist):
try:
@@ -62,6 +58,9 @@ def run(group, arglist):
managers = {cls.group: cls() for cls in all if cls.group + '_command' in defaults}
serv = managers[group]
args = dict(action='gui', ins=serv.main_ins)
ACTION = 1
INS = 2
SERVICE = 2 if serv.main_ins else 3
extra = []
pos = 0
unorder = False
@@ -76,7 +75,7 @@ def run(group, arglist):
if pos >= SERVICE:
unorder = True
pos = SERVICE
elif arg in serv.info or arg == 'all' or serv.wildcard(arg) is not None:
elif arg in serv.info or arg == 'all' or serv.wildcard(arg):
args['ins'] = arg
if pos >= INS:
unorder = True