diff options
| -rwxr-xr-x | public/thesiah.sh | 14 | ||||
| -rwxr-xr-x | static/thesiah.sh | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/public/thesiah.sh b/public/thesiah.sh index 2479a00..9b0768b 100755 --- a/public/thesiah.sh +++ b/public/thesiah.sh @@ -381,7 +381,7 @@ ufwsetup() { ufw allow in 'Postfix SMTPS' >/dev/null 2>&1 ufw allow in 'Mail Submission' >/dev/null 2>&1 sleep 1 - ufw enable >/dev/null 2>&1 || ufw --force enable >/dev/null 2>&1 + ufw enable || ufw --force enable sleep 1 case "$initsys" in "runit") @@ -412,7 +412,7 @@ sambasetup() { ufw allow 138/udp >/dev/null 2>&1 ufw allow 139/tcp >/dev/null 2>&1 ufw allow 445/tcp >/dev/null 2>&1 - [ -f /etc/samba/smb.conf ] || touch /etc/samba/smb.conf + [ -f /etc/samba/smb.conf ] && touch /etc/samba/smb.conf printf "$pass1" | smbpasswd -a "$name" >/dev/null 2>&1 sleep 1 case "$initsys" in @@ -661,13 +661,13 @@ installationloop putgitrepo "$dotfilesrepo" "/home/$name/.dotfiles" "$repobranch" rm -rf "/home/$name/.git/" "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" find /home/"$name" -maxdepth 1 -type f -name ".*" -exec rm -rf {} \; -cd "/home/$name/.dotfiles" && stow --no-folding . || exit 1 +cd "/home/$name/.dotfiles" && stow --no-folding -S ar && stow --no-folding -S default || exit 1 # Link profiles -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/shell/profile" "/home/$name/.zprofile" -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/x11/xprofile" "/home/$name/.xprofile" -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/bash/bash_profile" "/home/$name/.bash_profile" -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/bash/bashrc" "/home/$name/.bashrc" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/shell/profile" "/home/$name/.zprofile" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/x11/xprofile" "/home/$name/.xprofile" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/bash/bash_profile" "/home/$name/.bash_profile" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/bash/bashrc" "/home/$name/.bashrc" # Install vim plugins if not alread present. [ ! -f "/home/$name/.config/vim/autoload/plug.vim" ] && vimplugininstall diff --git a/static/thesiah.sh b/static/thesiah.sh index 2479a00..9b0768b 100755 --- a/static/thesiah.sh +++ b/static/thesiah.sh @@ -381,7 +381,7 @@ ufwsetup() { ufw allow in 'Postfix SMTPS' >/dev/null 2>&1 ufw allow in 'Mail Submission' >/dev/null 2>&1 sleep 1 - ufw enable >/dev/null 2>&1 || ufw --force enable >/dev/null 2>&1 + ufw enable || ufw --force enable sleep 1 case "$initsys" in "runit") @@ -412,7 +412,7 @@ sambasetup() { ufw allow 138/udp >/dev/null 2>&1 ufw allow 139/tcp >/dev/null 2>&1 ufw allow 445/tcp >/dev/null 2>&1 - [ -f /etc/samba/smb.conf ] || touch /etc/samba/smb.conf + [ -f /etc/samba/smb.conf ] && touch /etc/samba/smb.conf printf "$pass1" | smbpasswd -a "$name" >/dev/null 2>&1 sleep 1 case "$initsys" in @@ -661,13 +661,13 @@ installationloop putgitrepo "$dotfilesrepo" "/home/$name/.dotfiles" "$repobranch" rm -rf "/home/$name/.git/" "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" find /home/"$name" -maxdepth 1 -type f -name ".*" -exec rm -rf {} \; -cd "/home/$name/.dotfiles" && stow --no-folding . || exit 1 +cd "/home/$name/.dotfiles" && stow --no-folding -S ar && stow --no-folding -S default || exit 1 # Link profiles -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/shell/profile" "/home/$name/.zprofile" -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/x11/xprofile" "/home/$name/.xprofile" -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/bash/bash_profile" "/home/$name/.bash_profile" -sudo -u "$name" ln -sf "/home/$name/.dotfiles/.config/bash/bashrc" "/home/$name/.bashrc" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/shell/profile" "/home/$name/.zprofile" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/x11/xprofile" "/home/$name/.xprofile" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/bash/bash_profile" "/home/$name/.bash_profile" +sudo -u "$name" ln -sf "/home/$name/.dotfiles/ar/.config/bash/bashrc" "/home/$name/.bashrc" # Install vim plugins if not alread present. [ ! -f "/home/$name/.config/vim/autoload/plug.vim" ] && vimplugininstall |