From 15ea076efa93be02bbe7ef60f5d3d07c283edfc5 Mon Sep 17 00:00:00 2001
From: DarkFeather <darkfeather@aninix.net>
Date: Sat, 27 May 2017 16:38:14 -0500
Subject: [PATCH] Minor install issues

---
 ShadowArch/Makefile   | 6 +++++-
 ShadowArch/shadowarch | 6 ++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ShadowArch/Makefile b/ShadowArch/Makefile
index c4b5304..b8ccfdb 100644
--- a/ShadowArch/Makefile
+++ b/ShadowArch/Makefile
@@ -8,7 +8,7 @@ compile:
 install: 
 	cp ./vimrc /etc/vimrc
 	cp bash.bashrc /etc/bash.bashrc
-	cp -r skel /etc/skel
+	rsync -avz -r skel/ /etc/skel
 	cp tmux.conf /etc/tmux.conf
 
 repository: shadowarch
@@ -29,6 +29,10 @@ reverse: ${HTTPROOT}/shadowarch ${SYNCLIST}
 	cat ${HTTPROOT}/shadowarch > ./shadowarch
 	for i in ${SYNCLIST}; do rsync -avz ${SYNCLIST} .; done
 
+diff: ${HTTPROOT}/shadowarch ${SYNCLIST}
+	diff ./shadowarch ${HTTPROOT}/shadowarch || [ 1 -eq 1 ]
+	for i in ${SYNCLIST}; do diff "${i}" ./`echo ${i} | rev | cut -f 1 -d '/' | rev` || [ 1 -eq 1 ]; done
+
 find-missing-hooks-in-src:
 	@for i in `wget -q -O - https://aninix.net/foundation/ | grep toplevel-repo | cut -f 4 -d \'`; do if [ -z $$i ]; then continue; fi; for file in `find ../.. -type f -name Makefile | grep $$i`; do if [ -z "$$file" ]; then echo NO MAKEFILE FOR $$i; elif [ `grep -c -i 'hook for systemd' $$file` -eq 0 ]; then echo HOOK MISSING IN: $$file; else echo HOOK FOUND IN: $$file; fi; done; done
 	@for i in `wget -q -O - https://aninix.net/foundation/ | grep toplevel-repo | cut -f 4 -d \'`; do if [ -z $$i ]; then continue; fi; for file in `find ../.. -type f -name Makefile | grep $$i`; do if [ -z "$$file" ]; then echo NO MAKEFILE FOR $$i; elif [ `grep -c useradd $$file` -eq 0 ]; then echo DEPRIV MISSING IN: $$file; else echo DEPRIV FOUND IN: $$file; fi; done; done
diff --git a/ShadowArch/shadowarch b/ShadowArch/shadowarch
index c30f94f..a1a0adf 100644
--- a/ShadowArch/shadowarch
+++ b/ShadowArch/shadowarch
@@ -190,10 +190,8 @@ arch-chroot /mnt systemctl enable netctl
 arch-chroot /mnt netctl enable $interface
 
 # Vim cleanup for SSH
-mkdir -p /usr/share/vim/vimfiles/plugin
-printf 'set mouse-=a\n' > /usr/share/vim/vimfiles/plugin/shadowarch.vim
-
-ln -sf /etc/skel/.bashrc /mnt/root/.bashrc
+mkdir -p /mnt/usr/share/vim/vimfiles/plugin
+printf 'set mouse-=a\n' > /mnt/usr/share/vim/vimfiles/plugin/shadowarch.vim
 
 # Clone ConfigPackags from AniNIX::Foundation
 arch-chroot /mnt git -C /usr/local/src/ clone https://aninix.net/foundation/ConfigPackages