Use ln -f flag to overwrite targets and shorten code

2 files changed, 14 insertions, 17 deletions

diff --git a/install.sh b/install.sh
index 0802924..1bc705a 100755
--- a/install.sh
+++ b/install.sh
@@ -66,25 +66,25 @@ else
 fi
 
 mkdir -p ~/.config/bspwm
-ln -s ${PWD}/bspwmrc ~/.config/bspwm/bspwmrc
-ln -s ${PWD}/init_monitor.sh ~/.config/bspwm/init_monitor.sh
+ln -sf ${PWD}/bspwmrc ~/.config/bspwm/bspwmrc
+ln -sf ${PWD}/init_monitor.sh ~/.config/bspwm/init_monitor.sh
 
 mkdir -p ~/.config/sxhkd
-ln -s ${PWD}/sxhkdrc ~/.config/sxhkd/sxhkdrc
+ln -sf ${PWD}/sxhkdrc ~/.config/sxhkd/sxhkdrc
 
 mkdir -p ~/.config/rofi
-ln -s ${PWD}/rofi_config ~/.config/rofi/config
+ln -sf ${PWD}/rofi_config ~/.config/rofi/config
 
 mkdir -p ~/.config/polybar
-ln -s ${PWD}/polybar ~/.config/polybar
+ln -sf ${PWD}/polybar ~/.config/polybar
 
 cargo install alacritty
 
 mkdir -p ~/.config/alacritty
-ln -s ${PWD}/alacritty.yml ~/.config/alacritty/alacritty.yml
+ln -sf ${PWD}/alacritty.yml ~/.config/alacritty/alacritty.yml
 
 mkdir -p ~/.config
-ln -s ${PWD}/picom.conf ~/.config/picom.conf
+ln -sf ${PWD}/picom.conf ~/.config/picom.conf
 
 ${SUDO} usermod -G video ${USER}
 
diff --git a/shell_only.sh b/shell_only.sh
index 87619e9..cf899b7 100755
--- a/shell_only.sh
+++ b/shell_only.sh
@@ -57,21 +57,18 @@ fi
 
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
-ln -s ${PWD}/bin ~/bin
-
-rm ~/.zshrc
-rm ~/.zsh_aliases
+ln -sf ${PWD}/bin ~/bin
 
 mkdir -p ~/
-ln -s ${PWD}/zshrc ~/.zshrc
-ln -s ${PWD}/zsh_aliases ~/.zsh_aliases
-ln -s ${PWD}/tmux.conf ~/.tmux.conf
-ln -s ${PWD}/vimrc ~/.vimrc
+ln -sf ${PWD}/zshrc ~/.zshrc
+ln -sf ${PWD}/zsh_aliases ~/.zsh_aliases
+ln -sf ${PWD}/tmux.conf ~/.tmux.conf
+ln -sf ${PWD}/vimrc ~/.vimrc
 
 mkdir -p ~/.oh-my-zsh/completions/
-ln -s ${PWD}/_totp ~/.oh-my-zsh/completions/_totp
+ln -sf ${PWD}/_totp ~/.oh-my-zsh/completions/_totp
 
 mkdir -p ~/.local/bspwm-setup/
-ln -s ${PWD}/lockscreen.xkb ~/.local/bspwm-setup/lockscreen.xkb
+ln -sf ${PWD}/lockscreen.xkb ~/.local/bspwm-setup/lockscreen.xkb
 
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh