From 84f3b3dbf05bf3b88aeeca4b564d0f40949b6ecd Mon Sep 17 00:00:00 2001 From: sose Date: Fri, 11 Sep 2020 16:20:17 -0700 Subject: [PATCH] avoid doing unecessary things if a user already exists --- user.sh | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/user.sh b/user.sh index 478eee7..0e9ebf2 100755 --- a/user.sh +++ b/user.sh @@ -38,32 +38,33 @@ configure_user() { mv "$key_file" "/tilde/$tilde_name/key/" key_file="/tilde/$tilde_name/key/$(basename $key_file)" - if ! test -d "$user_homedir" + + if id -u "$tilde_username" 2>&1 >/dev/null then mkdir -p "$user_homedir" cp "/root/.gtkrc-2.0" "$user_homedir" cp -r "/root/.config" "$user_homedir" + + useradd "$tilde_username" -d "$user_homedir" + chown -R "$tilde_username:$tilde_username" "$user_homedir" + echo "$startx_command" > "$user_homedir/.xinitrc" + + usermod -a -G sudo "$tilde_username" + + mkdir '/etc/systemd/system/getty@tty1.service.d' + echo "[Service]" > '/etc/systemd/system/getty@tty1.service.d/override.conf' + echo "ExecStart=" >> '/etc/systemd/system/getty@tty1.service.d/override.conf' + echo "ExecStart=-/sbin/agetty --autologin $tilde_username %I $TERM" >> '/etc/systemd/system/getty@tty1.service.d/override.conf' + echo "Type=idle" >> '/etc/systemd/system/getty@tty1.service.d/override.conf' + chsh -s '/bin/bash' "$tilde_username" fi touch "$user_homedir/first_login" create_user_files "$key_file" "$tilde_username" "$tilde_name" "$user_homedir" - # this will fail when configuring a new tilde for an existing user - useradd "$tilde_username" -d "$user_homedir" - - chown -R "$tilde_username:$tilde_username" "$user_homedir" - chsh -s '/bin/bash' "$tilde_username" chown -R "$tilde_username:$tilde_username" "$tilde_homedir" chown "$tilde_username:$tilde_username" "$key_file" - echo "$startx_command" > "$user_homedir/.xinitrc" - usermod -a -G sudo "$tilde_username" - - mkdir '/etc/systemd/system/getty@tty1.service.d' - echo "[Service]" > '/etc/systemd/system/getty@tty1.service.d/override.conf' - echo "ExecStart=" >> '/etc/systemd/system/getty@tty1.service.d/override.conf' - echo "ExecStart=-/sbin/agetty --autologin $tilde_username %I $TERM" >> '/etc/systemd/system/getty@tty1.service.d/override.conf' - echo "Type=idle" >> '/etc/systemd/system/getty@tty1.service.d/override.conf' systemctl daemon-reload }