commit 2bf2e6449433de88d44a3d41396b9364d618ab94
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Sun Dec 11 12:58:14 2022 UTC

in gotd regress, use USER instead of USERNAME and check for sudo/doas users

Problem where USERNAME is not usually set on OpenBSD reported by Mikhail

ok jamsek

commit - f1cbd0efdc4e8ab0a64b07c66696940e20d5981e
commit + 2bf2e6449433de88d44a3d41396b9364d618ab94
blob - 1f10771a98fe00cf4c3029d94a41ae32341873e7
blob + 637c3892a77b86d3be16a1e964a55ed285543c41
--- regress/gotd/Makefile
+++ regress/gotd/Makefile
@@ -12,7 +12,13 @@ GOTD_DEVUSER_HOME!=userinfo $(GOTD_DEVUSER) | awk '/^d
 GOTD_TEST_REPO!?=mktemp -d "$(GOTD_TEST_ROOT)/gotd-test-repo-XXXXXXXXX"
 GOTD_TEST_REPO_URL=ssh://${GOTD_DEVUSER}@127.0.0.1/test-repo
 
-GOTD_TEST_USER?=${USERNAME}
+GOTD_TEST_USER?=${DOAS_USER}
+.if empty(GOTD_TEST_USER)
+GOTD_TEST_USER=${SUDO_USER}
+.endif
+.if empty(GOTD_TEST_USER)
+GOTD_TEST_USER=${USER}
+.endif
 GOTD_TEST_USER_HOME!=userinfo $(GOTD_TEST_USER) | awk '/^dir/ {print $$2}'
 
 # gotd.conf parameters