diff --git a/EtcFiles/profile.d/shadowarch.sh b/EtcFiles/profile.d/shadowarch.sh index d1b29b1..03ae806 100644 --- a/EtcFiles/profile.d/shadowarch.sh +++ b/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 diff --git a/LICENSE b/LICENSE index 878d895..e15653d 100644 --- a/LICENSE +++ b/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 - - 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 + + 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 diff --git a/Makefile b/Makefile index 5ca3666..6bb211b 100644 --- a/Makefile +++ b/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 diff --git a/UserScripts/src-maintenance b/UserScripts/src-maintenance index 0a3c014..e0587fd 100755 --- a/UserScripts/src-maintenance +++ b/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 $? } diff --git a/UserScripts/sslinfo b/UserScripts/sslinfo index b85feb5..30b3dd1 100755 --- a/UserScripts/sslinfo +++ b/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) diff --git a/UserScripts/worktrack b/UserScripts/worktrack index bfbf78f..1dd1007 100644 --- a/UserScripts/worktrack +++ b/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