From a7ecdcf5d0d55e8e695d5724c579f89ca2704f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 19 Aug 2021 18:02:16 +0200 Subject: Switch to portable [!...] vs. [^...] patterns. --- subr/build_init.subr | 4 ++-- subr/ex_pkg_restart.subr | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'subr') diff --git a/subr/build_init.subr b/subr/build_init.subr index 2d78da91..1e0c7d18 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -191,8 +191,8 @@ buildp_init_getopts() { fi; case "${_arg}" in *=*) rtl_set_var_unsafe "${_arg%%=*}" "${_arg#*=}"; ;; - [^a-zA-Z]*) _rc=1; _status="Error: build group names must start with [a-zA-Z] (in argument \`${_arg}'.)"; ;; - *[^_a-zA-Z]*) _rc=1; _status="Error: build group names must not contain [^_a-zA-Z] (in argument \`${_arg}'.)"; ;; + [!a-zA-Z]*) _rc=1; _status="Error: build group names must start with [a-zA-Z] (in argument \`${_arg}'.)"; ;; + *[!_a-zA-Z]*) _rc=1; _status="Error: build group names must not contain [!_a-zA-Z] (in argument \`${_arg}'.)"; ;; *) BUILD_GROUPS="$(rtl_lconcat "${BUILD_GROUPS}" "${_arg}")"; ;; esac; shift; fi; diff --git a/subr/ex_pkg_restart.subr b/subr/ex_pkg_restart.subr index d6f2bee5..9e51df8b 100644 --- a/subr/ex_pkg_restart.subr +++ b/subr/ex_pkg_restart.subr @@ -150,7 +150,7 @@ exp_pkg_expand_restart_at_virtual() { _epera_at="${1}"; shift; if [ "${_epera_at#@}" != "${_epera_at}" ]; then _epera_at="${_epera_at#@}"; - if [ "${_epera_at%[^0-9a-zA-Z_]*}" != "${_epera_at}" ]; then + if [ "${_epera_at%[!0-9a-zA-Z_]*}" != "${_epera_at}" ]; then _status="invalid virtual build step \`${_epera_at}'"; _epera_rc=1; elif eval [ '"${'"${_epera_rset}${_epera_at}"':+1}"' = 1 ]; then eval _epera_at='${'"${_epera_rset}${_epera_at}"'}'; -- cgit v1.2.3