summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2021-02-05 22:03:40 +0000
committerDarren Tucker <dtucker@dtucker.net>2021-02-06 09:35:14 +1100
commit5e385a71ef2317856f37c91a98658eb12eb5a89c (patch)
tree47d55855c1eafddf7bd81737bf81759e7821af4f
parentb446c214279de50ed8388e54897eb1be5281c894 (diff)
upstream: Roll back the hostname->uname change in rev 1.10. It turns
out uname -n doesn't do what we need for some platforms in portable, so we'll fix the original problem (that some other platforms don't have hostname at all) by providing wrapper function to implement it. OpenBSD-Regress-ID: 827a707d6201d5a8e196a8c28aec1d2c76c52341
-rw-r--r--regress/percent.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/percent.sh b/regress/percent.sh
index e39f0696..72f07f4b 100644
--- a/regress/percent.sh
+++ b/regress/percent.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: percent.sh,v 1.10 2021/02/05 06:01:58 dtucker Exp $
+# $OpenBSD: percent.sh,v 1.11 2021/02/05 22:03:40 dtucker Exp $
# Placed in the Public Domain.
tid="percent expansions"
@@ -10,8 +10,8 @@ fi
USER=`id -u -n`
USERID=`id -u`
-HOST=`uname -n | cut -f1 -d.`
-HOSTNAME=`uname -n`
+HOST=`hostname | cut -f1 -d.`
+HOSTNAME=`hostname`
# Localcommand is evaluated after connection because %T is not available
# until then. Because of this we use a different method of exercising it,