openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-25 22:56:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix non matching regex in grep.

Browse Source 
w/ landry@
This commit is contained in:
ajacoutot
2025-08-16 10:21:57 +00:00
parent db24b9d97d
commit 138240f74b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/rcctl/rcctl.sh
View File

@@ -1,6 +1,6 @@
#!/bin/ksh
#
# $OpenBSD: rcctl.sh,v 1.121 2025/08/10 09:30:55 ajacoutot Exp $
# $OpenBSD: rcctl.sh,v 1.122 2025/08/16 10:21:57 ajacoutot Exp $
#
# Copyright (c) 2014, 2015-2022 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -68,7 +68,7 @@ pkg_scripts_append()
if [ -z "${pkg_scripts}" ]; then
echo pkg_scripts="${_svc}" >>${_TMP_RCCONF}
elif ! echo ${pkg_scripts} | grep -qw -- ${_svc}; then
grep -v "^pkg_scripts.*=" /etc/rc.conf.local >${_TMP_RCCONF}
grep -v "^pkg_scripts *=" /etc/rc.conf.local >${_TMP_RCCONF}
echo pkg_scripts="${pkg_scripts} ${_svc}" >>${_TMP_RCCONF}
fi
rcconf_edit_end
@@ -91,7 +91,7 @@ pkg_scripts_order()
_pkg_scripts=$(echo "${_svcs} ${pkg_scripts}" | tr "[:blank:]" "\n" | \
awk -v ORS=' ' '!x[$0]++')
rcconf_edit_begin
grep -v "^pkg_scripts.*=" /etc/rc.conf.local >${_TMP_RCCONF}
grep -v "^pkg_scripts *=" /etc/rc.conf.local >${_TMP_RCCONF}
echo pkg_scripts=${_pkg_scripts} >>${_TMP_RCCONF}
rcconf_edit_end
}
@@ -409,7 +409,7 @@ svc_rm()
rcconf_edit_begin
if svc_is_special ${_svc}; then
grep -v "^${_svc}.*=" /etc/rc.conf.local >${_TMP_RCCONF}
grep -v "^${_svc} *=" /etc/rc.conf.local >${_TMP_RCCONF}
( svc_getdef ${_svc} status ) && \
echo "${_svc}=NO" >>${_TMP_RCCONF}
else
@@ -458,7 +458,7 @@ svc_set()
if svc_is_special ${_svc}; then
[ "${_var}" = "flags" ] || return
rcconf_edit_begin
grep -v "^${_svc}.*=" /etc/rc.conf.local >${_TMP_RCCONF}
grep -v "^${_svc} *=" /etc/rc.conf.local >${_TMP_RCCONF}
( svc_getdef ${_svc} status ) || \
echo "${_svc}=YES" >>${_TMP_RCCONF}
rcconf_edit_end
@@ -498,7 +498,7 @@ svc_set()
unset ${_svc}_${_var}
rcconf_edit_begin
grep -v "^${_svc}_${_var}.*=" /etc/rc.conf.local >${_TMP_RCCONF}
grep -v "^${_svc}_${_var} *=" /etc/rc.conf.local >${_TMP_RCCONF}
if [ -n "${_args}" ] || \
( svc_is_base ${_svc} && ! svc_getdef ${_svc} status && [ "${_var}" == "flags" ] ); then
echo "${_svc}_${_var}=${_args}" >>${_TMP_RCCONF}