diff options
| -rwxr-xr-x | public/thesiah.sh | 10 | ||||
| -rwxr-xr-x | static/thesiah.sh | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/public/thesiah.sh b/public/thesiah.sh index 482901c..ca8a377 100755 --- a/public/thesiah.sh +++ b/public/thesiah.sh @@ -166,19 +166,18 @@ gitmakeinstall() { cd "$dir" || return 1 sudo -u "$name" git pull --force origin master } - cd "$repodir" || exit 1 # Check the repository name and act accordingly for suckless case "$progname" in "suckless") for sub in "${progname}/"*; do - cd "$sub" || continue + cd "$repodir/$sub" || continue make >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. done ;; *) - cd "$progname" || exit 1 + cd "$dir" || exit 1 make >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. @@ -512,8 +511,9 @@ sshsetup() { whiptail --infobox "Setting up ssh..." 7 50 [ -x "$(command -v "ssh")" ] || installpkg openssh pacman -Qq openssh-"$initsys" >/dev/null 2>&1 || installpkg openssh-"$initsys" - sed -Ei "s/^#?(PasswordAuthentication).*/\1 no;s/^#?(UsePAM).*/\1 no" /etc/ssh/sshd_config >/dev/null 2>&1 - case "$initsys" in + sleep 1 + sed -Ei "s/^#?(PasswordAuthentication).*/\1 no;s/^#?(UsePAM).*/\1 no" /etc/ssh/sshd_config + case "$initsys" in "runit") ln -sf /etc/runit/sv/sshd /run/runit/service/ >/dev/null 2>&1 sleep 1 diff --git a/static/thesiah.sh b/static/thesiah.sh index 482901c..ca8a377 100755 --- a/static/thesiah.sh +++ b/static/thesiah.sh @@ -166,19 +166,18 @@ gitmakeinstall() { cd "$dir" || return 1 sudo -u "$name" git pull --force origin master } - cd "$repodir" || exit 1 # Check the repository name and act accordingly for suckless case "$progname" in "suckless") for sub in "${progname}/"*; do - cd "$sub" || continue + cd "$repodir/$sub" || continue make >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. done ;; *) - cd "$progname" || exit 1 + cd "$dir" || exit 1 make >/dev/null 2>&1 make install >/dev/null 2>&1 cd .. @@ -512,8 +511,9 @@ sshsetup() { whiptail --infobox "Setting up ssh..." 7 50 [ -x "$(command -v "ssh")" ] || installpkg openssh pacman -Qq openssh-"$initsys" >/dev/null 2>&1 || installpkg openssh-"$initsys" - sed -Ei "s/^#?(PasswordAuthentication).*/\1 no;s/^#?(UsePAM).*/\1 no" /etc/ssh/sshd_config >/dev/null 2>&1 - case "$initsys" in + sleep 1 + sed -Ei "s/^#?(PasswordAuthentication).*/\1 no;s/^#?(UsePAM).*/\1 no" /etc/ssh/sshd_config + case "$initsys" in "runit") ln -sf /etc/runit/sv/sshd /run/runit/service/ >/dev/null 2>&1 sleep 1 |