Adding wifi scripts; general cleanup

ShadowArch/Makefile

@@ -9,7 +9,7 @@ compile: ./shadowarch
 install: compile
 	for i in ${SYNCLIST}; do rsync -avz -r `echo $$i | sed 's#^/etc/##'` $$i; done
 	# This is a nicety.
-	if [ -f /root/shadowarch* ]; then sed -i 's/`uname -o`/ShadowArch/g' /etc/bash.bashrc; fi
+	if [ -f /root/shadowarch* ]; then sed -i 's/`uname -o`/ShadowArch/g' /etc/bashrc; fi
 
 repository: shadowarch ${HTTPROOT}
 	cp ./shadowarch ${HTTPROOT}
@@ -33,9 +33,9 @@ reverse: ${HTTPROOT}/shadowarch ${SYNCLIST}
 clean:
 	if [ -f /etc/bash.bashrc ]; then printf "Remove /etc/bash.bashrc? [y/n] "; read answer; if [ "$$answer" == "y" ]; then rm /etc/bash.bashrc; fi; fi
 
-diff: ${HTTPROOT}/shadowarch ${SYNCLIST}
-	diff ./shadowarch ${HTTPROOT}/shadowarch
-	for i in ${SYNCLIST}; do diff "$$i" ./`echo $$i | rev | cut -f 1 -d '/' | rev` || [ 1 -eq 1 ]; done
+diff: ${SYNCLIST}
+	if [ -f ${HTTPROOT}/shadowarch ]; then diff ./shadowarch ${HTTPROOT}/shadowarch; echo; fi
+	for i in ${SYNCLIST}; do diff -rc "$$i" ./`echo $$i | rev | cut -f 1 -d '/' | rev`; echo; 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

ShadowArch/bashrc

@@ -27,7 +27,6 @@ esac
 [ -f /etc/bash.motd ] && cat /etc/bash.motd
 
 ### AniNIX Customizations ###
-
 alias get-commands='for i in $( echo $PATH | sed "s/:/\n/g"); do ls $i; done | sort | less'
 alias whoison='who | grep -v tmux'
 alias startvnc="vncserver -xstartup startxfce4; echo Use \"ssh -L 5901:localhost:5901 $(whoami)@$(hostname)\" to tunnel connections."
@@ -35,7 +34,9 @@ alias vi=vim
 alias view="vim -R"
 alias top="top -o %CPU"
 alias make-entrypoints="egrep '^[a-zA-Z0-9\-]*:' Makefile"
-if [ -x `which torsocks 2>/dev/null` ] && [ `systemctl status tor 2>/dev/null| grep -c running` -eq 1 ]; then alias tor-lynx="torsocks lynx https://check.torproject.org/"; fi
+if [ -x `which torsocks 2>/dev/null` ] && [ `systemctl status tor 2>/dev/null| grep -c running` -eq 1 ]; then
+    alias tor-lynx="torsocks lynx https://check.torproject.org/"; 
+fi
 
 IFS="
 "
@@ -71,4 +72,7 @@ if [ ! -z "$SSH_CLIENT" ]; then
         fi 
         alias sdr="screen -d -r"
     fi;
+elif [ `who -m | egrep "^$(whoami)" | awk '{ print $2; }' | egrep -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ]; then
+    exec startxfce4
 fi
+

ShadowArch/skel/.bashrc

@@ -5,11 +5,6 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-# Source global definitions
-if [ -f /etc/bashrc ]; then
-    . /etc/bashrc
-fi
-
 # Allow separation so that /usr/local/bin/replicate-ssh-profiles doesn't carry local-only customizations downstream.
 if [ -f ~/.bashrc-local ]; then
     . ~/.bashrc-local