aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarLarge Libravatar memdmp <memdmpestrogenzone>2025-03-01 01:38:55 +0100
committerLibravatarLarge Libravatar memdmp <memdmpestrogenzone>2025-03-01 01:38:55 +0100
commite37aa0648b20f5e70e40ad69561b210f222f902d (patch)
tree1df20ad9fb99202ed14633219f9945e42d5aafba
parente90726c70dd224f1473124ffb05f1720056ea740 (diff)
parent71385bcaa56690e1320a4b8b3f8af70a7d6938f2 (diff)
downloadzuwu-e37aa0648b20f5e70e40ad69561b210f222f902d.tar.gz
zuwu-e37aa0648b20f5e70e40ad69561b210f222f902d.tar.bz2
zuwu-e37aa0648b20f5e70e40ad69561b210f222f902d.tar.lz
zuwu-e37aa0648b20f5e70e40ad69561b210f222f902d.zip

merge: Merge remote-tracking branch 'refs/remotes/origin/master'

-rw-r--r--CODE-OF-CONDUCT.md2
-rwxr-xr-xzuwu.zsh9
2 files changed, 10 insertions, 1 deletions
diff --git a/CODE-OF-CONDUCT.md b/CODE-OF-CONDUCT.md
index d40c14e..f6ad993 100644
--- a/CODE-OF-CONDUCT.md
+++ b/CODE-OF-CONDUCT.md
@@ -98,6 +98,6 @@ You are receiving this because you are subscribed to this thread.
Message ID: &lt;dmpmem/zuwu/pull/1@github.com&gt;
```
-This PR, made by an unknown (due to github marking them as spam :3) account, is obviously AI generated in it's entirety, does not address anything serious, includes a reference to the existing code without describing a change, does idiotic things like "INSTALL_DIR" being prioritized over a perfectly fine "TARGET". This both used my code as an input to an LLM (and likely added it to the training data being used by whatever company runs said LLM), and gave garbage out.
+This PR, ~~made by an unknown (due to github marking them as spam :3) account~~ (nvm, github was just randomly 404ing the link works now?), is obviously AI generated in it's entirety, does not address anything serious, includes a reference to the existing code without describing a change, does idiotic things like "INSTALL_DIR" being prioritized over a perfectly fine "TARGET". This both used my code as an input to an LLM (and likely added it to the training data being used by whatever company runs said LLM), and gave garbage out.
The only usable change was the `set -euo pipefail` being used over `set -e`. This is theoretically [bad practice](https://bbs.archlinux.org/viewtopic.php?id=240984), however is a theoretically ok addition as I had forgotten to run shellcheck (which outputted nothing useful) and shellharden on the scripts in this repo to this point, and it's more or less "standard industry practice" in some capacity.
diff --git a/zuwu.zsh b/zuwu.zsh
index 3883e42..6be8d8b 100755
--- a/zuwu.zsh
+++ b/zuwu.zsh
@@ -121,6 +121,7 @@ reloadopt() {
noop "${DELETE_CHAR:=true}"
noop "${INSEND_MOVE_KEY:=true}"
noop "${BINDKEY_KIND:=e}"
+ noop "${USE_COLOURED_LS_GREP:=true}"
__opt() {
if "$1"; then
@@ -140,6 +141,14 @@ reloadopt() {
__opt "$DO_AUTOCD" autocd
__opt "$DO_ERR_BEEP" beep
__opt "$DO_EXTENDED_BLOB" extendedglob
+ if "$USE_COLOURED_LS_GREP"; then
+ if [[ "$(which ls 2>&1)" != *color=* ]]; then
+ alias ls="ls --color=auto";
+ fi
+ if [[ "$(which grep 2>&1)" != *color=* ]]; then
+ alias grep="grep --color=auto"
+ fi
+ fi
if "$LINE_OR_BEGIN_SEARCH_KEY"; then
_bkey() {
zle -N "$1"