tidy: Use `sed -E` instead of `sed -r`

At the time, `-r` was a GNUism and `-E` was a BSDism.  However,
since then `-E` has become POSIX, and so GNU sed supports `-E`,
with `-r` as a deprecated alias.

14 files changed, 27 insertions, 29 deletions

diff --git a/INSTALL b/INSTALL
index 024dda6..94a72cb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -24,8 +24,6 @@ to cause issues.
 The "unusual" build-time dependencies are:
 
  - GNU Make -- other `make`s will not work.
- - GNU sed -- must support `-r` for ERE; BSD sed uses `-E` for this
-   purpose.
  - ronn -- A markdown-to-manpage converter
 
 Whether or not to build the manpages is controlled by whether
diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff
index 8482f92..c1bbec4 100755
--- a/src/abslibre-tools/libreaddiff
+++ b/src/abslibre-tools/libreaddiff
@@ -3,7 +3,7 @@
 
 # Copyright (C) 2011-2012 Michał Masłowski <mtjm@mtjm.eu>
 # Copyright (C) 2012 Daniel Molina (lluvia)
-# Copyright (C) 2017 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2017, 2024 Luke Shumaker <lukeshu@parabola.nu>
 #
 # License: GNU GPLv3+
 #
@@ -54,7 +54,7 @@ main() {
 	diff -U0 \
 	     <(pacman_list_packages "$repo" "$arch" | sort) \
 	     <(abslibre_list_packages "$repo" "$arch" | sort) \
-		| sed -rn 's/^[+-][^+-].+$/&/p'
+		| sed -En 's/^[+-][^+-].+$/&/p'
 }
 
 pacman_list_packages() {
diff --git a/src/abslibre-tools/libredbdiff b/src/abslibre-tools/libredbdiff
index b5e6331..bfa9fb3 100755
--- a/src/abslibre-tools/libredbdiff
+++ b/src/abslibre-tools/libredbdiff
@@ -2,7 +2,7 @@
 # libredbdiff
 #
 # Copyright (C) 2014 Esteban Carnevale <alfplayer@mailoo.org>
-# Copyright (C) 2014, 2017-2018 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2014, 2017-2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
 # Copyright (C) 2018 Omar Vega Ramos <ovruni@gnu.org.pe>
 #
 # License: GNU GPLv3+
@@ -262,7 +262,7 @@ main_update() {
 	{
 		msg "Generating %s %q" Parabola pacman.conf
 		cp -T /usr/share/pacman/defaults/pacman.conf.x86_64 "$conffile_prbl"
-		sed -r \
+		sed -E \
 		    -e "s|/etc/pacman\.d/mirrorlist$|$mirrorlist_prbl|" \
 		    -e "s|^#?DBPath\s*=.*|DBPath = $dbpath_prbl|" \
 		    -e "s|^#?Architecture\s*=.*|Architecture = x86_64|" \
@@ -277,7 +277,7 @@ main_update() {
 		     -O "$conffile_arch" \
 		     "https://git.archlinux.org/svntogit/packages.git/plain/pacman/repos/core-x86_64/pacman.conf" ||
 			die "Failed to download %q.  Exiting." "$conffile_arch"
-		sed -r \
+		sed -E \
 		    -e "s|/etc/pacman\.d/mirrorlist$|$mirrorlist_arch|" \
 		    -e "s|^#?DBPath\s*=.*|DBPath = $dbpath_arch|" \
 		    -e "s|^#?Architecture\s*=.*|Architecture = x86_64|" \
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index e3c390a..17bacad 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -5,7 +5,7 @@ set -euE
 # Copyright (C) 2010-2012 Nicolás Reynolds <fauno@parabola.nu>
 # Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
 # Copyright (C) 2012 Michał Masłowski <mtjm@mtjm.eu>
-# Copyright (C) 2012-2018 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2012-2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
 # Copyright (C) 2018 Andreas Grapentin <andreas@grapentin.org>
 # Copyright (C) 2019 Bill Auger <mr.j.spam.me@gmail.com>
 #
@@ -325,7 +325,7 @@ main() {
 				fi
 				trap 'rm -f -- "$tmppacmanconf"' EXIT
 				tmppacmanconf="$(mktemp --tmpdir librechroot-pacman.conf.XXXXXXXXXX)"
-				sed -r \
+				sed -E \
 				    -e "s|^#?\\s*Architecture.+|Architecture = ${OPTARG}|g" \
 				    -e "s|^.*Include\s*=\s*/etc/pacman.d/.*\.conf|#&|" \
 				    < "/usr/share/pacman/defaults/pacman.conf.$OPTARG" \
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 1871e19..c8e78b3 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -16,7 +16,7 @@ $(outdir)/blacklist.sh.pot: $(srcdir)/blacklist.sh $(srcdir)/librexgettext
 	@echo "OUT $@"
 	@{ \
 		sed -n '/^# Usage:/,/()/{ /^#/ { =; p; } }' $< | \
-			sed -r -e 's/^# (.*)/msgid "\1"\nmsgstr ""\n/' \
+			sed -E -e 's/^# (.*)/msgid "\1"\nmsgstr ""\n/' \
 			       -e 's|^[0-9]*$$|#. embedded usage text\n#: $(<F):&|' && \
 		cd $(<D) && ./librexgettext --simple=_l:2 $(<F) && \
 	:; } | $(libretools.pofmt) > $@
diff --git a/src/lib/blacklist.sh b/src/lib/blacklist.sh
index d36502e..196ba72 100755
--- a/src/lib/blacklist.sh
+++ b/src/lib/blacklist.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # This may be included with or without `set -euE`
 
-# Copyright (C) 2013-2014, 2016-2018 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2013-2014, 2016-2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
 # Copyright (C) 2017 Isaac David <isacdaavid@isacdaavid.info>
 #
 # License: GNU GPLv2+
@@ -32,7 +32,7 @@ blacklist-normalize() {
 		expr+=('-e' "s/^[^:]*(:[^:]*){${i}}$/&${sep}/")
 		sep+=${sep:0:1}
 	done
-	sed -r -e '/^#/d' "${expr[@]}"
+	sed -E -e '/^#/d' "${expr[@]}"
 }
 
 # Usage: blacklist-cat
diff --git a/src/lib/conf.sh.in b/src/lib/conf.sh.in
index bd9bde3..d7a9fb7 100644
--- a/src/lib/conf.sh.in
+++ b/src/lib/conf.sh.in
@@ -1,7 +1,7 @@
 #!/hint/bash
 # This may be included with or without `set -euE`
 
-# Copyright (C) 2012-2015, 2017-2018 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2012-2015, 2017-2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
 # Copyright (C) 2024 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 #
 # License: GNU GPLv2+
@@ -197,7 +197,7 @@ unset_PKGBUILD() {
 		local v
 		for v in "$@"; do
 			# shellcheck disable=228
-			unset -v "$v" $(declare -p|sed -rn "s/^declare -\S+ (${v}_[a-zA-Z0-9_]*)=.*/\1/p")
+			unset -v "$v" $(declare -p|sed -En "s/^declare -\S+ (${v}_[a-zA-Z0-9_]*)=.*/\1/p")
 		done
 	}
 
diff --git a/src/lib/librexgettext b/src/lib/librexgettext
index dce7010..43c0d42 100755
--- a/src/lib/librexgettext
+++ b/src/lib/librexgettext
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2013-2017 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2013-2017, 2024 Luke Shumaker <lukeshu@parabola.nu>
 #
 # License: GNU GPLv2+
 #
@@ -237,7 +237,7 @@ xgettext-flag() {
 
 whitespace-collapse() {
 	tr '\n' '\r' | sed 's/"\r\s*"//g' | tr '\r' '\n' | # This removes the awkward word-wrapping done by xgettext
-	    sed -r -e 's/(\\n|\\t|\t)/ /g' -e 's/(^|[^.!? ]) +/\1 /g' -e 's/([.!?])  +/\1  /g' # This collapses whitespace
+	    sed -E -e 's/(\\n|\\t|\t)/ /g' -e 's/(^|[^.!? ]) +/\1 /g' -e 's/([.!?])  +/\1  /g' # This collapses whitespace
 }
 
 main() {
diff --git a/src/lib/messages.sh b/src/lib/messages.sh
index 67cdab5..88e586f 100644
--- a/src/lib/messages.sh
+++ b/src/lib/messages.sh
@@ -3,7 +3,7 @@
 
 # Copyright (C) 2011 Joshua Ismael Haase Hernández (xihh) <hahj87@gmail.com>
 # Copyright (C) 2012 Nicolás Reynolds <fauno@parabola.nu>
-# Copyright (C) 2012-2014, 2016-2018 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2012-2014, 2016-2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
 #
 # For just the setup_traps() function:
 #   Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>
@@ -78,7 +78,7 @@ print() {
 whitespace_collapse() {
 	[[ $# == 0 ]] || panic
 
-	tr '\n' '\r' | sed -r \
+	tr '\n' '\r' | sed -E \
 			   -e 's/\r/  /g' -e 's/\t/ /g' \
 			   -e 's/(^|[^.!? ]) +/\1 /g' -e 's/([.!?])  +/\1  /g' \
 			   -e 's/\s+$//'
diff --git a/src/librefetch/librefetch b/src/librefetch/librefetch
index 0a1bb70..bcf49f4 100755
--- a/src/librefetch/librefetch
+++ b/src/librefetch/librefetch
@@ -240,10 +240,10 @@ parse_options() {
 	# makepkg options
 	local makepkg_orig
 	makepkg_orig="$(which makepkg)"
-	shrt1=($(LC_ALL=C "${makepkg_orig}" -h | sed -rn 's/^ +-(.)(,| [^<]).*/\1/p'))
-	shrt2=($(LC_ALL=C "${makepkg_orig}" -h | sed -rn 's/^ +-(.) <.*/\1/p'))
-	long1=($(LC_ALL=C "${makepkg_orig}" -h | sed -rn -e 's/^ +(-., )?--(\S*) [^<].*/\2/p'))
-	long2=($(LC_ALL=C "${makepkg_orig}" -h | sed -rn 's/^ +--(\S*) <.*/\1/p'))
+	shrt1=($(LC_ALL=C "${makepkg_orig}" -h | sed -En 's/^ +-(.)(,| [^<]).*/\1/p'))
+	shrt2=($(LC_ALL=C "${makepkg_orig}" -h | sed -En 's/^ +-(.) <.*/\1/p'))
+	long1=($(LC_ALL=C "${makepkg_orig}" -h | sed -En -e 's/^ +(-., )?--(\S*) [^<].*/\2/p'))
+	long2=($(LC_ALL=C "${makepkg_orig}" -h | sed -En 's/^ +--(\S*) <.*/\1/p'))
 
 	# librefetch options
 	shrt1+=(C D g S M h)
diff --git a/src/librefetch/librefetch-install b/src/librefetch/librefetch-install
index 2cdb014..f4b0f40 100755
--- a/src/librefetch/librefetch-install
+++ b/src/librefetch/librefetch-install
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # lirefetch-install: (un)install librefetch to /etc/makepkg.conf
 #
-# Copyright (C) 2013-2015, 2017 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2013-2015, 2017, 2024 Luke Shumaker <lukeshu@parabola.nu>
 #
 # License: GNU GPLv3+
 #
@@ -48,7 +48,7 @@ pre_remove() {
 	local file=$1
 	print ":: %s: removing librefetch from %q" "${0##*/}" "$(realpath -s "$file")"
 
-	sed -ri 's/^#(.*) # commented out by the libretools post_install script/\1/' "$file"
+	sed -Ei 's/^#(.*) # commented out by the libretools post_install script/\1/' "$file"
 	local line
 	for line in "${old_code[@]}"; do
 		del_line "$file" "$line"
diff --git a/src/librefetch/librefetchdir/libmakepkg/source.sh.gen b/src/librefetch/librefetchdir/libmakepkg/source.sh.gen
index 02dbb6f..da9b9be 100755
--- a/src/librefetch/librefetchdir/libmakepkg/source.sh.gen
+++ b/src/librefetch/librefetchdir/libmakepkg/source.sh.gen
@@ -1,7 +1,7 @@
-#!/usr/bin/sed -rf
+#!/usr/bin/sed -Ef
 # librefetchdir/source.sh.gen
 #
-# Copyright (C) 2013, 2016, 2018 Luke Shumaker <lukeshu@parabola.nu>
+# Copyright (C) 2013, 2016, 2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
 #
 # License: GNU GPLv3+
 #
diff --git a/src/librefetch/librefetchdir/makepkg.gen b/src/librefetch/librefetchdir/makepkg.gen
index 31cdfe6..bdbce62 100755
--- a/src/librefetch/librefetchdir/makepkg.gen
+++ b/src/librefetch/librefetchdir/makepkg.gen
@@ -1,4 +1,4 @@
-#!/usr/bin/sed -rf
+#!/usr/bin/sed -Ef
 # librefetchdir/makepkg.gen
 #
 # Copyright (C) 2013-2018, 2024 Luke Shumaker <lukeshu@parabola.nu>
diff --git a/src/pkgbuild-check-nonfree b/src/pkgbuild-check-nonfree
index 6bec280..4ae9a7c 100755
--- a/src/pkgbuild-check-nonfree
+++ b/src/pkgbuild-check-nonfree
@@ -133,7 +133,7 @@ pkgbuild_get_pkg_str() {
 	local var=$2
 
 	local indirect=${!var}
-	eval "$(declare -f "package_$pkg" | sed -rn "s/^\s*${var}(\+?=)/indirect\1/p")"
+	eval "$(declare -f "package_$pkg" | sed -En "s/^\s*${var}(\+?=)/indirect\1/p")"
 	printf '%s' "${indirect}"
 }
 # Usage: eval $(pkgbuild_get_pkg_ary ${pkgname} ${varname} [$variable_name_to_set])
@@ -146,7 +146,7 @@ pkgbuild_get_pkg_ary() {
 
 	local ary="${var}[@]"
 	local indirect=("${!ary}")
-	eval "$(declare -f "package_$pkg" | sed -rn "s/^\s*${var}(\+?=)/indirect\1/p")"
+	eval "$(declare -f "package_$pkg" | sed -En "s/^\s*${var}(\+?=)/indirect\1/p")"
 	declare -p indirect|sed "s/ indirect=/ ${out}=/"
 }