Improve setup and update scripts pt.2

scripts/setup.sh

@@ -3,29 +3,55 @@
 set -e
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+TOOLKIT_DIR="$SCRIPT_DIR"/..
 
-# Load default shell scripts
-. $SCRIPT_DIR/../sh/load.sh
+# Load package manager script
+. "$SCRIPT_DIR"/util/pkg-mgr.sh
 
-update_default_shell() {
-	/usr/sbin/usermod -sf /usr/bin/zsh $1
+# Load color script
+. "$SCRIPT_DIR"/util/color.sh
+
+update_user_shell() {
+	/usr/sbin/usermod -s /usr/bin/zsh "$1"
 }
 
-install_shell_config() {
-	/usr/bin/ln -s /etc/toolkit/sh/.zshrc $1
+install_user_config() {
+	/usr/bin/ln -s /etc/toolkit/sh/"$1" "$2"
 }
 
+print_info Installing necessary packages...
+
 install_package zsh
 
-update_default_shell root
-update_default_shell coby
+print_info Setting up user shells...
 
-install_shell_config /root/.zshrc
-install_shell_config /home/coby/.zshrc
+update_user_shell root
+update_user_shell coby
+
+install_user_config .zshrc /root/.
+install_user_config .zshrc /home/coby/.
+
+install_user_config .vimrc /root/.
+install_user_config .vimrc /home/coby/.
 
 # Replace old ssh server config
-rm /etc/ssh/sshd_config
-ln -sf /etc/toolkit/sshd/sshd_config /etc/ssh/.
+if [[ -d /etc/ssh ]]; then
+  ln -sf "$TOOLKIT_DIR"/ssh/sshd_config /etc/ssh/.
+elif
+  print_warn /etc/ssh does not exist, failed to install sshd config
+fi
+
+# Install cronjobs
+if [[ -d /etc/cron.d ]]; then
+  ln -sf "$TOOLKIT_DIR"/cron/* /etc/cron.d/.
+elif
+  print_warn /etc/cron.d does not exist, failed to install cronjobs
+  print_warn Are you running a debian-based distro?
+fi
+
+print_info Installing necessary submodules...
 
 # Pull submodules
-. $SCRIPT_DIR/update.sh
+git submodule update --init --recursive
+
+print_info Setup complete