From 731c4385cc2dea34401847bd30662681076ad883 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sun, 21 Jul 2024 22:06:15 -0700
Subject: [PATCH] move `maybesudo` logic into the eponymous file

---
 home/shrc    |  4 ----
 sh/maybesudo | 12 ++++++++++++
 sh/pippy     |  3 +--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/home/shrc b/home/shrc
index 91f71cb..978f234 100644
--- a/home/shrc
+++ b/home/shrc
@@ -26,15 +26,11 @@ if has sudo; then
         printf '\033[7m %s \033[m\n' 'warning: you ran sudo when you meant doas!'
         sudo "$@"
     }
-    maybesudo() { sudo "$@"; }
 elif has doas; then
     sudo() {
         printf '\033[7m %s \033[m\n' 'warning: you ran doas when you meant sudo!'
         doas "$@"
     }
-    maybesudo() { doas "$@"; }
-else
-    maybesudo() (__maybesudo "$@")
 fi
 
 ADDPATH() { ### @- append a directory to `$PATH` if it isn't already present.
diff --git a/sh/maybesudo b/sh/maybesudo
index 592bf00..c592891 100755
--- a/sh/maybesudo
+++ b/sh/maybesudo
@@ -134,4 +134,16 @@ __maybesudo() { ### @maybesudo
 }
 
 maybesudo_()(__maybesudo "$@") # deprecated
+
+[ -n "${preload+-}" ] || . ~/sh/preload || exit 2
+eval ${preload:-preload} has
+
+if has sudo; then
+    maybesudo() { sudo "$@"; }
+elif has doas; then
+    maybesudo() { doas "$@"; }
+else
+    maybesudo() (__maybesudo "$@")
+fi
+
 [ -n "${preload+-}" ] || __maybesudo "$@"
diff --git a/sh/pippy b/sh/pippy
index 280bf65..b2acd40 100755
--- a/sh/pippy
+++ b/sh/pippy
@@ -11,8 +11,7 @@ pippy() { ### @-
         ~/work/automamba --pip install --upgrade --upgrade-strategy only-if-needed "$@"
         return
     fi
-    local sudo="$(has sudo || echo maybesudo_)"
-    "$sudo" python3 -m pip install --upgrade --upgrade-strategy only-if-needed "$@"
+    maybesudo python3 -m pip install --upgrade --upgrade-strategy only-if-needed "$@"
 }
 
 [ -n "${preload+-}" ] || . ~/sh/preload || exit 2