diff -ur v21/ftp_ut.py v22/ftp_ut.py --- v21/ftp_ut.py 2020-03-30 23:51:37.000000000 +0900 +++ v22/ftp_ut.py 2020-04-29 18:41:38.000000000 +0900 @@ -330,17 +330,18 @@ def help(): msgs = [ '[-h] [-debug] [-s site_name] [-C dir]', - ' host user passwd [put] path ..', - ' host user passwd del path ..', - ' host user passwd mkdir path ..', - ' host user passwd rmdir path ..', - ' host user passwd ls path ..', - ' host user passwd lst path ..', - ' host user passwd find path ..', - ' host user passwd rm_rf path ..', - ' host user passwd lock path ..', - ' host user passwd unlock path ..', - ' host user passwd get path ..', + '[ -SITE "host user passwd" ]' + ' [put] path ..', + ' del path ..', + ' mkdir path ..', + ' rmdir path ..', + ' ls path ..', + ' lst path ..', + ' find path ..', + ' rm_rf path ..', + ' lock path ..', + ' unlock path ..', + ' get path ..', '', ' site_name in ftp_ut.yaml, can ommit host user passwd' ] @@ -348,22 +349,21 @@ if __name__ == "__main__": a = arg.new() - - site = a.pop_str('-s') - v = get_site( site ) + if a.is_pop( '-h' ): + help() (host, uesr, passwd, cd) = ('', '', '', '') - if v: - if type(v) == str: + + s = a.pop_str( '-SITE' ) + if s: + (host, user, passwd) = s.split() + else: + site = a.pop_str('-s') + v = get_site( site ) + if not v or type(v) == str: dbg.err('err in .yaml, ' + v) help() (host, user, passwd, cd) = v - else: - host = a.pop() - if not host or a.is_pop('-h'): - help() - user = a.pop() - passwd = a.pop() if not cd: cd = a.pop_str('-C')