From a40c7799b9230b3e4f3b0626b7b0f8ead26cd570 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sat, 24 Feb 2024 02:44:42 -0800
Subject: [PATCH] begin rewriting shrc (disables most aliases)

---
 home/shrc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/home/shrc b/home/shrc
index cd293ec..b28f380 100644
--- a/home/shrc
+++ b/home/shrc
@@ -1,7 +1,7 @@
 #!/usr/bin/env false
 # for ash, dash, bash, and zsh.
 
-[ -n "$ZSH_VERSION" -o -n "$BASH_VERSION" ] && FANCY=1 || FANCY=0
+_=: && [ -z $_ ] && FANCY=1 || FANCY=0 # detect zsh and bash
 if [ "$FANCY" = 0 ]; then
     . ~/.prep # handle boring stuff like /etc/profile and $PATH
 fi
@@ -22,13 +22,8 @@ else
 fi
 
 ADDPATH() { ### @- append a directory to `$PATH` if it isn't already present.
-    if [ $# -ne 1 ]; then
-        printf 'ADDPATH: expected exactly 1 argument, got %s\n' $# >&2
-        return 2
-    fi
-    if [ "$1" != "${1#[A-Z]:\\}" ]; then
-        set -- "$(cygpath -u "$1" || printf '%s\n' "$1")"
-    fi
+    [ $# = 1 ] || { printf >&2 'ADDPATH: expected exactly 1 argument, got %s\n' $#; return 64; }
+    [ "$1" = "${1#[A-Z]:\\}" ] || set -- "$(cygpath -u "$1" || printf '%s\n' "$1")"
     set -- "$(readlink -f "$1")" "$1"
     if ! [ -d "$1" ]; then
         if [ -e "$1" ]; then
@@ -51,7 +46,7 @@ ADDPATH() { ### @- append a directory to `$PATH` if it isn't already present.
 }
 
 ROPATH() {
-    [ $# -eq 0 ] || { printf '%s: expected exactly %s arguments, got %s\n' ROPATH 0 $# >&2; return 2; }
+    [ $# = 0 ] || { printf >&2 'ROPATH: expected exactly 0 arguments, got %s\n' $#; return 64; }
     local segment= previous= newpath= oldpath="$PATH:"
     while segment="${oldpath%%:*}"; [ "$segment" != "$oldpath" ]; do
         [ -z "$segment" ] || [ -z "$previous" ] || newpath="$newpath$previous:"
@@ -105,6 +100,8 @@ if [ "$FANCY" = 1 ]; then
     #alias make="$(have colormake || have make)"
 fi
 
+if false; then # currently in the process of rewriting these
+
 # just flags {{{2
 
 export LESS='-SRQc'
@@ -136,7 +133,7 @@ alias gb='git --no-pager branch' ### @- display the current git branch.
 ### the *gb* package that i don't use.
 gdp() { ### @- invoke `gd` to diff a commit from its parent. the commit defaults to "HEAD".
     local commit="${1:-HEAD}"
-    [ $# -le 1 ] || { printf '%s: %s\n' gdp "too many arguments" >&2; return 2; }
+    [ $# -le 1 ] || { printf '%s: %s\n' gdp "too many arguments" >&2; return 64; }
     gd "$commit~" "$commit"
 }
 
@@ -195,4 +192,6 @@ alias unused='comm -23 <(pacman -Qtq | sort) <(pacman -Qeq | sort) | tr -d "\t"'
 alias makepkgf='makepkg -Af --skipchecksums --skippgpcheck' ### @- make the freakin' package!
 alias rakef='rake && gem build *.gemspec && gem install *.gem' ### @- make the freakin' gem!
 
+fi
+
 pl() { printf '%s\n' "$@"; } ### @- print each argument on its own line.