summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpublic/thesiah-debian.sh27
-rwxr-xr-xstatic/thesiah-debian.sh27
2 files changed, 38 insertions, 16 deletions
diff --git a/public/thesiah-debian.sh b/public/thesiah-debian.sh
index ddc36f7..72b6914 100755
--- a/public/thesiah-debian.sh
+++ b/public/thesiah-debian.sh
@@ -49,18 +49,25 @@ preinstallmsg() {
adduserandpass() {
whiptail --infobox "Adding user \"$name\"..." 7 50
- adduser --disabled-password --gecos "" --ingroup sudo --shell /bin/zsh "$name" || error "Failed to add user $name"
+ adduser --ingroup sudo --shell /bin/zsh "$name" ||
+ usermod -a -G sudo "$name" && mkdir -p \
+ "/home/$name/Desktop" \
+ "/home/$name/Documents" \
+ "/home/$name/Downloads" \
+ "/home/$name/Music" \
+ "/home/$name/Pictures" \
+ "/home/$name/Private/git" \
+ "/home/$name/Public" \
+ "/home/$name/Torrent/complete" \
+ "/home/$name/Torrent/incomplete" \
+ "/media/flash" \
+ "/mnt/second" \
+ "/home/$name" && chown -R "$name":sudo /home/"$name"
echo "$name:$pass1" | chpasswd
- usermod -aG sudo "$name"
-
export repodir="/home/$name/.local/src"
mkdir -p "$repodir"
- chown -R "$name": "$repodir"
-
+ chown -R "$name":sudo "$(dirname "$repodir")"
unset pass1 pass2
-
- trap 'rm -f /etc/sudoers.d/thesiah-temp' HUP INT QUIT TERM PWR EXIT
- echo "$name ALL=(ALL) NOPASSWD: ALL Defaults:$name runcwd=*" >/etc/sudoers.d/thesiah-temp
}
installationloop() {
@@ -259,6 +266,10 @@ preinstallmsg || error "User exited."
adduserandpass || error "Error adding username and/or password."
+trap 'rm -f /etc/sudoers.d/thesiah-temp' HUP INT QUIT TERM PWR EXIT
+echo "%sudo ALL=(ALL) NOPASSWD: ALL
+Defaults:sudo,root runcwd=*" >/etc/sudoers.d/thesiah-temp
+
installationloop
lfinstall || error "User exited."
diff --git a/static/thesiah-debian.sh b/static/thesiah-debian.sh
index ddc36f7..72b6914 100755
--- a/static/thesiah-debian.sh
+++ b/static/thesiah-debian.sh
@@ -49,18 +49,25 @@ preinstallmsg() {
adduserandpass() {
whiptail --infobox "Adding user \"$name\"..." 7 50
- adduser --disabled-password --gecos "" --ingroup sudo --shell /bin/zsh "$name" || error "Failed to add user $name"
+ adduser --ingroup sudo --shell /bin/zsh "$name" ||
+ usermod -a -G sudo "$name" && mkdir -p \
+ "/home/$name/Desktop" \
+ "/home/$name/Documents" \
+ "/home/$name/Downloads" \
+ "/home/$name/Music" \
+ "/home/$name/Pictures" \
+ "/home/$name/Private/git" \
+ "/home/$name/Public" \
+ "/home/$name/Torrent/complete" \
+ "/home/$name/Torrent/incomplete" \
+ "/media/flash" \
+ "/mnt/second" \
+ "/home/$name" && chown -R "$name":sudo /home/"$name"
echo "$name:$pass1" | chpasswd
- usermod -aG sudo "$name"
-
export repodir="/home/$name/.local/src"
mkdir -p "$repodir"
- chown -R "$name": "$repodir"
-
+ chown -R "$name":sudo "$(dirname "$repodir")"
unset pass1 pass2
-
- trap 'rm -f /etc/sudoers.d/thesiah-temp' HUP INT QUIT TERM PWR EXIT
- echo "$name ALL=(ALL) NOPASSWD: ALL Defaults:$name runcwd=*" >/etc/sudoers.d/thesiah-temp
}
installationloop() {
@@ -259,6 +266,10 @@ preinstallmsg || error "User exited."
adduserandpass || error "Error adding username and/or password."
+trap 'rm -f /etc/sudoers.d/thesiah-temp' HUP INT QUIT TERM PWR EXIT
+echo "%sudo ALL=(ALL) NOPASSWD: ALL
+Defaults:sudo,root runcwd=*" >/etc/sudoers.d/thesiah-temp
+
installationloop
lfinstall || error "User exited."