summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2003-05-09 08:03:08 +0000
committermartti <martti@pkgsrc.org>2003-05-09 08:03:08 +0000
commit3d837bc498f6a9e786b7b5e4a9abb9b88461a5e8 (patch)
tree8c8bc6ad1a08f031bfaa24fcec7a089917da1c82
parent197ae29fda37ec169b2509691c85dba90dda311a (diff)
downloadpkgsrc-3d837bc498f6a9e786b7b5e4a9abb9b88461a5e8.tar.gz
Updated etcupdate to 20030509
* sync with current (use awk instead of fgrep and sed)
-rw-r--r--sysutils/etcupdate/Makefile4
-rwxr-xr-xsysutils/etcupdate/files/etcupdate4
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile
index 778cf4efda3..a5957500c3b 100644
--- a/sysutils/etcupdate/Makefile
+++ b/sysutils/etcupdate/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2003/04/06 03:53:23 grant Exp $
+# $NetBSD: Makefile,v 1.24 2003/05/09 08:03:08 martti Exp $
-DISTNAME= etcupdate-20030305
+DISTNAME= etcupdate-20030509
WRKSRC= ${WRKDIR}
CATEGORIES= sysutils
MASTER_SITES= # empty
diff --git a/sysutils/etcupdate/files/etcupdate b/sysutils/etcupdate/files/etcupdate
index 82c1163c4dd..f1c829ead88 100755
--- a/sysutils/etcupdate/files/etcupdate
+++ b/sysutils/etcupdate/files/etcupdate
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: etcupdate,v 1.21 2003/04/05 18:17:22 perry Exp $
+# $NetBSD: etcupdate,v 1.22 2003/05/09 08:03:10 martti Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -55,7 +55,7 @@ PATH="/sbin:/usr/sbin:/bin:/usr/bin:${PATH}"
TEMPROOT="${TEMPROOT:=/tmp/temproot}"
SRCDIR="${SRCDIR:=/usr/src/etc}"
PAGER="${PAGER:=/usr/bin/more}"
-SWIDTH=`stty -a | fgrep columns | sed -E 's/.+ ([0-9]+) columns.+/\1/'`
+SWIDTH=`stty -a | awk '/columns/{w=$6}END{if(w==0){w=80}print w}'`
WIDTH="${WIDTH:=${SWIDTH}}"
VERBOSE=
CONTINUE=