License update & egrep replacement for hooks

EtcFiles/profile.d/shadowarch.sh

@@ -90,7 +90,7 @@ function vncdesktop() {
 alias vi=vim
 alias view="vim -R"
 alias top="top -o %CPU"
-alias make-entrypoints="egrep '^[a-zA-Z0-9\-]*:' Makefile"
+alias make-entrypoints="grep -E '^[a-zA-Z0-9\-]*:' Makefile"
 alias rdns="dig +short -x "
 alias dns="dig +short "
 export WEECHAT_HOME=$HOME/.weechat
@@ -114,6 +114,6 @@ if [ -n "$SSH_CLIENT" ]; then
     fi;
 
 ### XFCE4 ###
-elif [ `who -m | egrep "^$(whoami)" | awk '{ print $2; }' | egrep -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ] && [ `pgrep -ac xinit` -eq 0 ] && [ `whoami` != 'root' ]; then
+elif [ `who -m | grep -E "^$(whoami)" | awk '{ print $2; }' | grep -E -c "^tty"` -eq 1 ] && [ -x /usr/sbin/startxfce4 ] && [ `pgrep -ac xinit` -eq 0 ] && [ `whoami` != 'root' ]; then
     exec startxfce4
 fi

LICENSE

@@ -1,27 +1,31 @@
-# http://www.wtfpl.net/about/
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                    Version 2, December 2004
-
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
-
-            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. You just DO WHAT THE FUCK YOU WANT TO.
-
-                        ANINIX ADDENDUM
-
- Trademark Pending 2017 (https://aninix.net/irc/)
- 
- The "AniNIX" name and |> logo is trademark-pending as of 2017. All
- AniNIX materials can be reproduced and re-used, though you must
- contact the admins of the network to get written permission to use
- the AniNIX name. 
-
- Attribution is appreciated for other materials but not legally
- required or necessary.
+# http://www.wtfpl.net/about/
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+
+                        ANINIX ADDENDUM
+
+ Trademark 2017 (https://aninix.net/)
+
+ The "AniNIX" name and |> logo are trademarked as of 2017/11/21.
+ AniNIX materials may be reproduced and re-used (though you must
+ contact the admins of the network to get written permission to use
+ the AniNIX name or logo) so long as such reproduction or re-use
+ does not inhibit the original AniNIX use of the same.
+
+ Attribution is appreciated for other materials but not legally
+ required or necessary.
+
+ "AniNIX" trademark serial: 87177883
+ |> Logo trademark serial: 87177887

Makefile

@@ -24,4 +24,4 @@ diff:
 localinstall: 
 	mkdir -p ~/bin/
 	for i in AdminScripts UserScripts; do cd $$i; for j in `ls -1 | grep -v Makefile`; do install -o ${USER} -m 0755 "$$j" /home/${USER}/bin/; done; cd ..; done
-	cd EtcFiles; for i in `ls -1 | egrep -v '*.service|skel|Makefile'`; do cp "$$i" /home/${USER}/."$$i"; done
+	cd EtcFiles; for i in `ls -1 | grep -E -v '*.service|skel|Makefile'`; do cp "$$i" /home/${USER}/."$$i"; done

UserScripts/src-maintenance

@@ -51,7 +51,7 @@ function writeOutList() {
         printf "$(echo "$clone" | sed 's#^\.\/##' | sed 's/\/$//') "
         git config remote.origin.url
         cd $HOME
-    done | sort | uniq | egrep -iv 'aninix|gitea@localhost|/srv/foundation|homedir' > "$conffile"
+    done | sort | uniq | grep -E -iv 'aninix|gitea@localhost|/srv/foundation|homedir' > "$conffile"
     exit $?
 }
 

UserScripts/sslinfo

@@ -39,7 +39,7 @@ function Usage() {
 
 # Translate output into CSV format.
 function machineReadable() {
-    egrep 'After|DNS|Subject:' | sed 's/^\s\+//' | sed 's/Not After : //' | sed 's/Subject: //' | sed 's/DNS://g' | tr '\n' ','
+    grep -E 'After|DNS|Subject:' | sed 's/^\s\+//' | sed 's/Not After : //' | sed 's/Subject: //' | sed 's/DNS://g' | tr '\n' ','
     echo
 }
 
@@ -88,6 +88,6 @@ elif [ -n "$showserial" ]; then
 elif [ -n "$dump" ]; then # 2. Parse the object.
     grep -A 99 BEGIN\ CERTIFICATE
 else
-    egrep -i "$regex"
+    grep -E -i "$regex"
 fi) \
      | (if [ -z "$machinereadable" ]; then cat; else machineReadable; fi)

UserScripts/worktrack

@@ -34,7 +34,7 @@ case "$command" in
     *)
         echo Usage: $0 '[command]'
         echo Available commands:
-        egrep '\"\) *$' $0 | cut -f 2 -d '"'
+        grep -E '\"\) *$' $0 | cut -f 2 -d '"'
         exit 1;
         ;;
 esac