From 2ef1731f35a6ae5cbe3bb3cfff97f6ac13b61461 Mon Sep 17 00:00:00 2001
From: Adam <24621027+adoyle0@users.noreply.github.com>
Date: Fri, 3 Feb 2023 04:26:50 -0500
Subject: [PATCH] send

---
 .scripts/doors/install_min_arch | 12 +++++++-----
 .scripts/doors/setup            |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.scripts/doors/install_min_arch b/.scripts/doors/install_min_arch
index 19da545..534aa85 100755
--- a/.scripts/doors/install_min_arch
+++ b/.scripts/doors/install_min_arch
@@ -2,7 +2,10 @@
 
 # Yay
 git clone https://aur.archlinux.org/yay.git &&
-cd yay && makepkg -si --noconfirm && rm -rf yay &&
+cd yay &&
+makepkg -si --noconfirm &&
+cd &&
+rm -rf yay &&
 
 # Base/Shell
 yay -S --needed --noconfirm \
@@ -17,8 +20,7 @@ nnn \
 \
 `# Aur`\
 nvim-packer-git \
-oh-my-zsh-git
+oh-my-zsh-git &&
 
-rsync -avzP --copy-links Doors/ ./
-rm -rf Doors;
-sudo chsh -s /bin/zsh $USER;
+rsync -avzP .doors/ ./ &&
+sudo chsh -s $(which zsh) $USER
diff --git a/.scripts/doors/setup b/.scripts/doors/setup
index 0718e50..5718c52 100755
--- a/.scripts/doors/setup
+++ b/.scripts/doors/setup
@@ -12,7 +12,9 @@ if [[ $OS == *Arch* ]]; then
     sudo sed '/Color/s/^#//' -i /etc/pacman.conf &&
     sudo pacman -S --needed --noconfirm git rsync base-devel  &&
     git clone https://github.com/adoyle0/Doors.git &&
-    rsync -avzP --copy-links Doors/ ./
+    mkdir .doors &&
+    rsync -avzP Doors/ .doors &&
+    rmdir Doors &&
     .scripts/doors/install_min_arch
 
 elif [[ $OS == *buntu* ]]; then