Merge pull request #9 from minrk/tidy-users

tidy saveuser scripts a bit
jupyterhub · Apr 27, 2016 · 67da004 · 67da004
2 parents 25d9c97 + f2fb213
commit 67da004
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/roles/saveusers/files/create_users.py b/roles/saveusers/files/create_users.py
@@ -11,21 +11,18 @@
     sys.exit()
 
 with open(fname, 'r') as f:
-    users = json.loads(f.read())    
+    users = json.load(f)
 
 for username, uid in users:
     home_dir = os.path.abspath(os.path.join('.', username))
     try:
         udata = pwd.getpwnam(username)
     except KeyError:
+        cmd = ['adduser', '-q', '--uid', str(uid),
+               '--no-create-home', '--home', home_dir,
+               '--gecos', '""', '--disabled-password', username]
         if os.path.isdir(home_dir):
-            cmd = ['adduser', '-q', '--uid', str(uid),
-                   '--no-create-home', '--home', home_dir,
-                   '--gecos', '""', '--disabled-password', username]
-        else:
-            cmd = ['adduser', '-q', '--uid', str(uid),
-                   '--home', home_dir,
-                   '--gecos', '""', '--disabled-password', username]
+            cmd.append('--no-create-home')
         print('Creating user: {}'.format(' '.join(cmd)))
         try:
             check_call(cmd)

diff --git a/roles/saveusers/files/save_users.py b/roles/saveusers/files/save_users.py
@@ -14,5 +14,5 @@
         data.append((username, uid))
         print("Saving user: {}:{}".format(username, uid))
 
-with open('./saved_users.txt','w') as f:
-    f.write(json.dumps(data))
+with open('./saved_users.txt', 'w') as f:
+    json.dump(data, f)