From dd8a4972e69a55a5b933c0a210ca68cb9bb33053 Mon Sep 17 00:00:00 2001 From: Mike Small Date: Mon, 28 Sep 2020 21:19:27 -0400 Subject: [PATCH 1/3] Make check: ksh is ksh93 on slackware. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2c49549..c109694 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,11 @@ frfac: check: `./latest_perl` -wc frfac.in perlcritic frfac.in - ksh93 -n getviaphone + if which ksh93 2> /dev/null; then \ + ksh93 -n getviaphone; \ + else \ + ksh -n getviaphone; \ + fi install: frfac sudo install -o root -g wheel -m 0755 -d /usr/local/bin From 8161badc0e817864b2f0d83cb8b642d46c7c3bed Mon Sep 17 00:00:00 2001 From: Mike Small Date: Tue, 29 Sep 2020 13:42:30 -0400 Subject: [PATCH 2/3] Makefile: ignore all which output --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c109694..057a5f5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ frfac: check: `./latest_perl` -wc frfac.in perlcritic frfac.in - if which ksh93 2> /dev/null; then \ + if which ksh93 > /dev/null 2>&1; then \ ksh93 -n getviaphone; \ else \ ksh -n getviaphone; \ From 5d32d69b2c6b0ebfb9504f45cbc5baa9b801dfd1 Mon Sep 17 00:00:00 2001 From: Mike Small Date: Tue, 29 Sep 2020 14:15:23 -0400 Subject: [PATCH 3/3] Makefile: openbsd sed is fussy about i cmd It wants i to be... i\ text to insert Decided to use a substitution instead of delete and insert. Eventually figured out how to account for both shell and Make's variable substitution and quoting rules. I hate Unix today. Test again on Slackware 14.2 asap. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 057a5f5..a83d416 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ frfac: - sed "1d;2i #!`./latest_perl`" frfac.in > frfac + sed '1s@^.*$$@\#\!'$$(latest_perl)@ frfac.in > frfac check: `./latest_perl` -wc frfac.in