Skip to content

Commit 063e483

Browse files
author
Nicolas Beguier
committed
CASSH Client : fix config file order
1 parent 93a1151 commit 063e483

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

cassh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -247,26 +247,11 @@ class CASSH(object):
247247

248248
if __name__ == '__main__':
249249

250-
CONF_FILE = '%s/.cassh' % getenv('HOME')
251-
252-
if not isfile(CONF_FILE):
253-
print('Config file missing : %s' % CONF_FILE)
254-
print('Example:')
255-
print('[user]')
256-
print('name = user')
257-
print('key_path = ~/.ssh/id_rsa')
258-
print('key_signed_path = ~/.ssh/id_rsa_signed')
259-
print('url = https://cassh.net')
260-
print('')
261-
print('[ldap]')
262-
print('realname = ursula.ser@domain.fr')
263-
exit(1)
264-
265250
PARSER = ArgumentParser()
266251

267252
SUBPARSERS = PARSER.add_subparsers(help='commands')
268253

269-
PARSER.add_argument('--version', action='version', version='%(prog)s 1.0.0')
254+
PARSER.add_argument('--version', action='version', version='%(prog)s 1.0.1')
270255

271256
# ADMIN Arguments
272257
ADMIN_PARSER = SUBPARSERS.add_parser('admin',\
@@ -300,6 +285,21 @@ if __name__ == '__main__':
300285

301286
ARGS = PARSER.parse_args()
302287

288+
CONF_FILE = '%s/.cassh' % getenv('HOME')
289+
290+
if not isfile(CONF_FILE):
291+
print('Config file missing : %s' % CONF_FILE)
292+
print('Example:')
293+
print('[user]')
294+
print('name = user')
295+
print('key_path = ~/.ssh/id_rsa')
296+
print('key_signed_path = ~/.ssh/id_rsa_signed')
297+
print('url = https://cassh.net')
298+
print('')
299+
print('[ldap]')
300+
print('realname = ursula.ser@domain.fr')
301+
exit(1)
302+
303303
LBC = CASSH(read_conf(CONF_FILE))
304304

305305
if len(sys.argv) == 1:

0 commit comments

Comments
 (0)