Now that all ports rc.* scripts are using #!/bin/ksh

- change [] tests to [[]] - change arithmetic [] tests to (()) - change = to == inside [[]] - remove unecessary quoting inside [[]] OK aja@
2018-01-14 14:42:18 +00:00 · 2018-01-14 14:42:18 +00:00 · 214644a454
commit 214644a454
parent e0cf2824ac
30 changed files with 70 additions and 70 deletions
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.116 2018/01/11 19:27:03 rpe Exp $
+# $OpenBSD: Makefile,v 1.117 2018/01/14 14:42:18 rpe Exp $

 COMMENT-main =		flexible mail transfer agent
 COMMENT-eximon =	X11 monitor tool for Exim MTA
@ -8,7 +8,7 @@ DISTNAME =		exim-${VERSION}
 PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
 FULLPKGPATH-eximon =	${PKGPATH},-eximon
-REVISION-main =		0
+REVISION-main =		1

 CATEGORIES =		mail

--- a/mail/exim/pkg/exim.rc
+++ b/mail/exim/pkg/exim.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: exim.rc,v 1.4 2018/01/11 19:27:03 rpe Exp $
+# $OpenBSD: exim.rc,v 1.5 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/bin/exim -bd"
 daemon_flags="-q30m"
@ -8,7 +8,7 @@ daemon_flags="-q30m"
 . /etc/rc.d/rc.subr

 rc_pre() {
-	[ ! -f /etc/mailer.conf.exim ]
+	[[ ! -f /etc/mailer.conf.exim ]]
 }

 rc_cmd $1
--- a/mail/kopano/core/Makefile
+++ b/mail/kopano/core/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2018/01/11 19:27:03 rpe Exp $
+# $OpenBSD: Makefile,v 1.10 2018/01/14 14:42:18 rpe Exp $

 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-mapi=	kopano MAPI extensions for PHP

 PKGNAME-main=	kopano-core-${V}.${BUILD}
 PKGNAME-mapi=	kopano-mapi-${V}.${BUILD}
-REVISION-main=	0
+REVISION-main=	1

 CATEGORIES=	mail www productivity

--- a/mail/kopano/core/pkg/kopano.rc
+++ b/mail/kopano/core/pkg/kopano.rc
@ -1,18 +1,18 @@
 #!/bin/ksh
 #
-# $OpenBSD: kopano.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
+# $OpenBSD: kopano.rc,v 1.3 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.
 _pkg_scripts="kopano_server kopano_spooler kopano_monitor kopano_gateway kopano_ical kopano_search"

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
 	for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
 	_pkg_scripts=${_l% }
 fi
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:06 rpe Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/14 14:42:18 rpe Exp $

 COMMENT=	high-performance and extensible DHCP server engine from ISC

@ -6,7 +6,7 @@ VERSION=	1.2.0

 DISTNAME=	kea-${VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-REVISION=	0
+REVISION=	1

 SHARED_LIBS +=  kea-asiodns               0.0 # 0.0
 SHARED_LIBS +=  kea-asiolink              2.0 # 4.0
--- a/net/kea/pkg/kea.rc
+++ b/net/kea/pkg/kea.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: kea.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $
+# $OpenBSD: kea.rc,v 1.4 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/sbin/keactrl"

@ -9,7 +9,7 @@ daemon="${TRUEPREFIX}/sbin/keactrl"
 pexp="${TRUEPREFIX}/sbin/kea-dhcp(4|6|-ddns).*"

 rc_pre() {
-	if ! [ -d ${LOCALSTATEDIR}/run/kea ]; then
+	if [[ ! -d ${LOCALSTATEDIR}/run/kea ]]; then
 		install -d -o root -g _kea -m 775 ${LOCALSTATEDIR}/run/kea
 	fi
 }
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.64 2018/01/11 19:27:06 rpe Exp $
+# $OpenBSD: Makefile,v 1.65 2018/01/14 14:42:18 rpe Exp $

 PORTROACH=	limit:^2

 COMMENT=	AFP file and print services for IP networks

 DISTNAME=	netatalk-2.2.5
-REVISION=	10
+REVISION=	11
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
--- a/net/netatalk/pkg/netatalk.rc
+++ b/net/netatalk/pkg/netatalk.rc
@ -1,18 +1,18 @@
 #!/bin/ksh
 #
-# $OpenBSD: netatalk.rc,v 1.8 2018/01/11 19:27:06 rpe Exp $
+# $OpenBSD: netatalk.rc,v 1.9 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.
 _pkg_scripts="cnid_metad afpd"

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
 	for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
 	_pkg_scripts=${_l% }
 fi
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.247 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: Makefile,v 1.248 2018/01/14 14:42:18 rpe Exp $

 VERSION =		4.6.11
 DISTNAME =		samba-${VERSION}
@ -14,7 +14,7 @@ PKGNAME-ldb =		ldb-${LDB_V}
 PKGNAME-tevent =	tevent-${TEVENT_V}
 PKGNAME-util =		samba-util-${VERSION}
 PKGNAME-docs =		samba-docs-${VERSION}
-REVISION-main =		0
+REVISION-main =		1

 PKG_ARCH-docs =		*

--- a/net/samba/pkg/samba.rc
+++ b/net/samba/pkg/samba.rc
@ -1,18 +1,18 @@
 #!/bin/ksh
 #
-# $OpenBSD: samba.rc,v 1.11 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: samba.rc,v 1.12 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.
 _pkg_scripts="smbd nmbd"

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
 	for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
 	_pkg_scripts=${_l% }
 fi
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: Makefile,v 1.15 2018/01/14 14:42:18 rpe Exp $

 COMMENT=	l2tp client/server

 GH_ACCOUNT=	xelerance
 GH_PROJECT=	xl2tpd
 GH_TAGNAME=	v1.3.10.1
-REVISION=	0
+REVISION=	1

 CATEGORIES=	net

--- a/net/xl2tpd/pkg/xl2tpd.rc
+++ b/net/xl2tpd/pkg/xl2tpd.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: xl2tpd.rc,v 1.3 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: xl2tpd.rc,v 1.4 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/sbin/xl2tpd"
 daemon_user="_xl2tpd"
@ -9,7 +9,7 @@ daemon_user="_xl2tpd"

 rc_pre() {
 	/usr/bin/install -d -o ${daemon_user} /var/run/xl2tpd
-	[ -p /var/run/xl2tpd/l2tp-control ] ||
+	[[ -p /var/run/xl2tpd/l2tp-control ]] ||
 	    mkfifo /var/run/xl2tpd/l2tp-control
 }

--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.232 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: Makefile,v 1.233 2018/01/14 14:42:18 rpe Exp $

 COMMENT-main=		Common Unix Printing System
 COMMENT-libs=		CUPS libraries and headers
@ -11,7 +11,7 @@ GH_TAGNAME=		v${VERSION}
 PKGNAME-main=		cups-${VERSION}
 PKGNAME-libs=		cups-libs-${VERSION}

-REVISION-main=		2
+REVISION-main=		3

 CATEGORIES=		print sysutils

--- a/print/cups/pkg/cupsd.rc
+++ b/print/cups/pkg/cupsd.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: cupsd.rc,v 1.27 2018/01/11 19:27:08 rpe Exp $
+# $OpenBSD: cupsd.rc,v 1.28 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/sbin/cupsd"

@ -22,7 +22,7 @@ rc_pre() {

 	# no existing printcap means we're not running lpd(8) so link cups'
 	# printcap so base lp commands can find and use cups printers
-	if [ ! -e /etc/printcap ]; then
+	if [[ ! -e /etc/printcap ]]; then
 		ln -s ${SYSCONFDIR}/cups/printcap /etc/printcap
 		# please check_mtree() in security(8); /etc/mtree/special
 		chmod -h 0644 /etc/printcap
@ -30,7 +30,7 @@ rc_pre() {
 }

 rc_post() {
-	if [ -h /etc/printcap ]; then                           
+	if [[ -h /etc/printcap ]]; then                           
 		rm /etc/printcap                                
 	fi
 }
--- a/security/spiped/Makefile
+++ b/security/spiped/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2018/01/11 19:27:09 rpe Exp $
+# $OpenBSD: Makefile,v 1.12 2018/01/14 14:42:18 rpe Exp $

 COMMENT =		utility for creating secure pipes between socket addresses

 DISTNAME =		spiped-1.6.0
 CATEGORIES =		security sysutils
-REVISION =		0
+REVISION =		1

 MAINTAINER =		James Turner <james@calminferno.net>

--- a/security/spiped/pkg/spiped.rc
+++ b/security/spiped/pkg/spiped.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: spiped.rc,v 1.3 2018/01/11 19:27:09 rpe Exp $
+# $OpenBSD: spiped.rc,v 1.4 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/bin/spiped"
 daemon_flags="-D -d -s '[0.0.0.0]:8022' -t '[127.0.0.1]:22' -k ${SYSCONFDIR}/spiped/spiped.key -p /var/run/spiped/spiped.pid"
@ -13,7 +13,7 @@ rc_reload=NO

 rc_pre() {
 	install -d -o _spiped /var/run/spiped
-	if [ ! -f ${SYSCONFDIR}/spiped/spiped.key ]; then
+	if [[ ! -f ${SYSCONFDIR}/spiped/spiped.key ]]; then
 		dd if=/dev/urandom bs=32 count=1 of=${SYSCONFDIR}/spiped/spiped.key
 	fi
 }
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.120 2018/01/11 19:27:09 rpe Exp $
+# $OpenBSD: Makefile,v 1.121 2018/01/14 14:42:18 rpe Exp $

 # XXX building this port while a version is already installed on the
 # system will lead to unexpected hidden dependencies!!!
@ -18,7 +18,7 @@ PKGNAME-bat=		bacula-bat-$V
 PKGNAME-mysql=		bacula-mysql-$V
 PKGNAME-pgsql=		bacula-pgsql-$V
 PKGNAME-sqlite3=	bacula-sqlite3-$V
-REVISION-main=		0
+REVISION-main=		1
 REVISION-server=	0

 CATEGORIES=		sysutils
--- a/sysutils/bacula/pkg/bacula.rc
+++ b/sysutils/bacula/pkg/bacula.rc
@ -1,17 +1,17 @@
 #!/bin/ksh
 #
-# $OpenBSD: bacula.rc,v 1.5 2018/01/11 19:27:09 rpe Exp $
+# $OpenBSD: bacula.rc,v 1.6 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
 	# stop the FD first so that SD will fail jobs and update catalog
 	_pkg_scripts="bacula_fd bacula_sd bacula_dir"
 else
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.57 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: Makefile,v 1.58 2018/01/14 14:42:18 rpe Exp $

 BROKEN =	pkg_add fails: problem with symlinks

 COMMENT =	GNU system administration tool for networks

 DISTNAME =	cfengine-3.7.2
-REVISION =	0
+REVISION =	1

 SHARED_LIBS +=  promises	0.0 # 1.0
 CATEGORIES =	sysutils
--- a/sysutils/cfengine/pkg/cfengine.rc
+++ b/sysutils/cfengine/pkg/cfengine.rc
@ -1,18 +1,18 @@
 #!/bin/ksh
 #
-# $OpenBSD: cfengine.rc,v 1.5 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: cfengine.rc,v 1.6 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.
 _pkg_scripts="cf_execd cf_monitord"

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
        for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
        _pkg_scripts=${_l% }
 fi
--- a/sysutils/google-compute-engine/Makefile
+++ b/sysutils/google-compute-engine/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: Makefile,v 1.3 2018/01/14 14:42:18 rpe Exp $

 COMMENT =		Google Cloud Platform (GCP) Compute Engine daemon

 MODPY_EGG_VERSION =	2.4.0
 DISTNAME =		google-compute-engine-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1

 GH_ACCOUNT =		GoogleCloudPlatform
 GH_PROJECT =		compute-image-packages
--- a/sysutils/google-compute-engine/pkg/google_compute_engine.rc
+++ b/sysutils/google-compute-engine/pkg/google_compute_engine.rc
@ -1,18 +1,18 @@
 #!/bin/ksh
 #
-# $OpenBSD: google_compute_engine.rc,v 1.2 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: google_compute_engine.rc,v 1.3 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.
 _pkg_scripts="google_accounts_daemon google_clock_skew_daemon google_ip_forwarding_daemon"

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
 	for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
 	_pkg_scripts=${_l% }
 	${MODPY_BIN} ${TRUEPREFIX}/bin/google_metadata_script_runner \
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.97 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: Makefile,v 1.98 2018/01/14 14:42:18 rpe Exp $

 COMMENT-main=		UPS monitoring program supporting many brands
 COMMENT-cgi=		CGIs for monitoring Nut-based UPSs
@ -12,7 +12,7 @@ PKGNAME-cgi=		${DISTNAME:S/-/-cgi-/}
 PKGNAME-snmp=		${DISTNAME:S/-/-snmp-/}
 PKGNAME-xml=		${DISTNAME:S/-/-xml-/}

-REVISION-main=		3
+REVISION-main=		4
 REVISION-snmp=		1
 REVISION-xml=		2
 REVISION-cgi=		1
--- a/sysutils/nut/pkg/nut.rc
+++ b/sysutils/nut/pkg/nut.rc
@ -1,17 +1,17 @@
 #!/bin/ksh
 #
-# $OpenBSD: nut.rc,v 1.3 2018/01/11 19:27:10 rpe Exp $
+# $OpenBSD: nut.rc,v 1.4 2018/01/14 14:42:18 rpe Exp $

 # "meta" script running the following rc.d(8) scripts with the given argument;
 # note that daemon_flags, daemon_user, daemon_timeout and daemon_class are not
 # passed to the child scripts.

-if [ "$1" = restart ]; then
+if [[ $1 == restart ]]; then
 	$0 stop && $0 start
 	exit
 fi

-if [ "$1" = stop ]; then
+if [[ $1 == stop ]]; then
 	_pkg_scripts="upsmon upsd"
 else
 	_pkg_scripts="upsd upsmon"
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.266 2018/01/11 19:27:12 rpe Exp $
+# $OpenBSD: Makefile,v 1.267 2018/01/14 14:42:18 rpe Exp $

 COMMENT=		GNOME display manager

 GNOME_PROJECT=		gdm
 GNOME_VERSION=		3.26.2.1
-REVISION=		2
+REVISION=		3

 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} puflogh1000X248.gif:0
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
--- a/x11/gnome/gdm/pkg/gdm.rc
+++ b/x11/gnome/gdm/pkg/gdm.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: gdm.rc,v 1.42 2018/01/11 19:27:12 rpe Exp $
+# $OpenBSD: gdm.rc,v 1.43 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/sbin/gdm"

@ -24,7 +24,7 @@ rc_stop() {

 # /etc/X11/xenodm/TakeConsole, fbtab(5)
 rc_post() {
-	if [ -c /dev/drm0 ]; then
+	if [[ -c /dev/drm0 ]]; then
 		chown root /dev/drm0
 	fi
 	# XXX OpenBSD needs an implementation of XDG_RUNTIME_DIR
--- a/x11/kde/base3/Makefile
+++ b/x11/kde/base3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.157 2018/01/11 19:27:12 rpe Exp $
+# $OpenBSD: Makefile,v 1.158 2018/01/14 14:42:18 rpe Exp $

 COMMENT-main =		K Desktop Environment, basic applications
 COMMENT-samba =		K Desktop Environment, samba support
@ -13,7 +13,7 @@ PKGNAME-en_US =		kde3-locale-en_US-${VERSION}
 PKGNAME-locale =	kde3-locale-${VERSION}
 PKG_ARCH-en_US =	*
 PKG_ARCH-locale =	*
-REVISION-main =		52
+REVISION-main =		53
 REVISION-samba =	28
 REVISION-en_US =	6
 REVISION-locale =	5
--- a/x11/kde/base3/pkg/kdm.rc
+++ b/x11/kde/base3/pkg/kdm.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: kdm.rc,v 1.3 2018/01/11 19:27:12 rpe Exp $
+# $OpenBSD: kdm.rc,v 1.4 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/bin/kdm"

@ -8,13 +8,13 @@ daemon="${TRUEPREFIX}/bin/kdm"

 rc_reload=NO

-if [ -n "${INRC}" ]; then
+if [[ -n ${INRC} ]]; then
 # on boot: wait for ttys to be initialized in bg so we we don't hang in _rc_wait
 rc_start() {
 	( local i=0
 	while ! pgrep -qf "^/usr/libexec/getty "; do
 		sleep 1
-		[ $((i++)) -ge 10 ] && return 1
+		(( $((i++)) >= 10 )) && return 1
 	done
 	# XXX KDM fails to receive input unless getty is given
 	# some more time for initialization.
--- a/x11/kde4/workspace/Makefile
+++ b/x11/kde4/workspace/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.61 2018/01/11 19:27:12 rpe Exp $
+# $OpenBSD: Makefile,v 1.62 2018/01/14 14:42:18 rpe Exp $

 COMMENT =	KDE workspace
 DISTNAME =	kde-workspace-4.11.21
-REVISION =	19
+REVISION =	20

 MASTER_SITES =	${MASTER_SITE_KDE:=Attic/applications/15.04.3/src/}

--- a/x11/kde4/workspace/pkg/kdm.rc
+++ b/x11/kde4/workspace/pkg/kdm.rc
@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# $OpenBSD: kdm.rc,v 1.10 2018/01/11 19:27:12 rpe Exp $
+# $OpenBSD: kdm.rc,v 1.11 2018/01/14 14:42:18 rpe Exp $

 daemon="${TRUEPREFIX}/bin/kdm"

@ -8,13 +8,13 @@ daemon="${TRUEPREFIX}/bin/kdm"

 rc_reload=NO

-if [ -n "${INRC}" ]; then
+if [[ -n ${INRC} ]]; then
 # on boot: wait for ttys to be initialized in bg so we we don't hang in _rc_wait
 rc_start() {
 	( local i=0
 	while ! pgrep -qf "^/usr/libexec/getty "; do
 		sleep 1
-		[ $((i++)) -ge 10 ] && return 1
+		(( $((i++)) >= 10 )) && return 1
 	done
 	# XXX KDM fails to receive input unless getty is given
 	# some more time for initialization.