Skip to content

Comments

Fix support for older shell interpreters and related tools#3107

Merged
jimklimov merged 61 commits intonetworkupstools:masterfrom
jimklimov:issue-3099
Oct 2, 2025
Merged

Fix support for older shell interpreters and related tools#3107
jimklimov merged 61 commits intonetworkupstools:masterfrom
jimklimov:issue-3099

Conversation

@jimklimov
Copy link
Member

@jimklimov jimklimov commented Oct 1, 2025

Initiated by #3099 discussion

nbriggs and others added 30 commits October 1, 2025 12:44
@nbriggs @jimklimov
Modifies Makefile.am files and some script ".in" files to use $EGREP
cb1dadf 
The standard Solaris 10/11 "/usr/bin/grep" does not accept the "-E"
option.  The autotools will set EGREP to the best available tool.

Makefile.am that need EGREP functionality should use $(EGREP)
rather than directly calling "grep -E".

Additionally, scripts that are generated to be installed as part
of the package that need EGREP functionality should use the same
tool that was located during configuration (assuming no
cross-compilation with different EGREP tool availability).

Closes networkupstools#3099
@jimklimov
ci_build.sh: avoid "[ -e" or "test -e" which some older shells lack [n…
a242642 
…etworkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/NIT/nit.sh: avoid "[ -e" or "test -e" which some older shells l…
083efef 
…ack [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Makefile.am: avoid "[ -e" or "test -e" which some older shells lack [n…
5b385ec 
…etworkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/Makefile.am: avoid "[ -e" or "test -e" which some older shells l…
63a5004 
…ack [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/gitlog2version.sh: avoid "[ -e" or "test -e" which some older s…
709ebd0 
…hells lack and do crash trying [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/gitlog2version.sh: use or discover EGREP to avoid literal "grep…
2aeaf56 
… -E" [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/gitlog2version.sh: avoid shell substitution missing in older sh…
44a6a31 
…ells [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
autogen.sh: report about testing generated script syntax [networkupst…
3b6cc60 
…ools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
autogen.sh: use or discover EGREP to avoid literal "grep -E" [network…
795e021 
…upstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
autogen.sh: avoid "find -not ..." [networkupstools#3099]
beed9c8 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/Makefile.am: fix library search order for upsdrvctl build [ne…
dd25650 
…tworkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/nutdrv_hashx.c: do not directly require "stdint.h" [networkup…
cfdcfd1 
…stools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: use or discover EGREP to avoid literal "grep -E" [networ…
6e343d7 
…kupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/Solaris/reset-ups-usb-solaris.sh.sample: roll back "grep -E" …
fa13eac 
…requirement [networkupstools#3099, networkupstools#1660]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/subdriver/gen-snmp-subdriver.sh: use or discover EGREP to avo…
1168bf1 
…id literal "grep -E"; also GREP; avoid "grep -q" [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/subdriver/gen-usbhid-subdriver.sh: use or discover EGREP to a…
89675dd 
…void literal "grep -E"; also GREP; avoid "grep -q" [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/nut-dumpdiff.sh: use or discover EGREP to avoid literal "grep -…
2dceda0 
…E" [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/NIT/nit.sh: use or discover EGREP to avoid literal "grep -E"; a…
1f8ecd0 
…lso GREP [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/man/Makefile.am: avoid "[ -e" or "test -e" which some older shel…
f00ef25 
…ls lack [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
m4/ax_realpath.m4: protect against lack of "test -e" even better (som…
ee42181 
…e shells do crash trying) [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/Solaris/postinstall.in: avoid "[ -e" or "test -e" which some …
5117548 
…older shells lack [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
NEWS.adoc: summarize fixes for "grep" and "test" callouts [issue netw…
25e3df9 
…orkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
autogen.sh, ci_build.sh: export GREP or EGREP if we detect them, so f…
43c953b 
…urther called scripts do not have to re-detect [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
include/Makefile.am: nut_version.h: export GREP or EGREP detected by …
3b5818e 
…configure, so further called scripts do not have to re-detect [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/NIT/Makefile.am: nut_version.h: export GREP or EGREP detected b…
98998cf 
…y configure, so further called scripts do not have to re-detect [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
configure.ac: avoid "[ -e" or "test -e" which some older shells lack [n…
20fd193 
…etworkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
configure.ac: detect and export (E)GREP as early as possible [network…
5e36a92 
…upstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/driver-list-format.sh: use or discover EGREP to avoid literal "…
6404bf3 
…grep -E" [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/gitlog2version.sh: use or discover GREP to avoid literal "grep" […
786a78f 
…networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot
Copy link

AppVeyorBot commented Oct 1, 2025

❌ Build nut 2.8.4.3556-master failed (commit 204ef6449a by @jimklimov)

@jimklimov
Portability: in some shells, "if" only accepts the list of commands t…
ef21797 
…o run (there is no "if ! condition" support) [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/installer/*: fix syntax to pass on old Solaris 8 /bin/sh [net…
88d4072 
…workupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Portability: in some shells, "if" only accepts the list of commands t…
e9de9f3 
…o run (there is no "if ! condition" support) - some better hidden cases [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tests/NIT/nit.sh: "id -u" is not ubiquitous, find fallback ways to ch…
61743f7 
…eck that I_AM_ROOT [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
NEWS.adoc: update about portability fixes [networkupstools#3099]
d56a8b5 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Makefile.am, tests/nut-driver-enumerator-test.sh: fallback for absent…
037febd 
… "diff -u" feature; use detected or passed EGREP [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/driver-list-format.sh, docs/docinfo.xml.sh.in: fallback for abs…
980853e 
…ent "diff -u" feature in pretty reporting [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@AppVeyorBot
Copy link

AppVeyorBot commented Oct 1, 2025

✅ Build nut 2.8.4.3558-master completed (commit 85987df61b by @jimklimov)

jimklimov added 10 commits October 1, 2025 18:21
@jimklimov
tools/driver-list-format.sh: sed class [[:blank:]] is not portable [n…
d8f9bbe 
…etworkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/driver-list-format.sh: revise reaction to "diff" problems or su…
a8955cd 
…ccesses [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: fix GGREP detection [networkupstools#3099]
6ec2485 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: avoid "GREP -e", it is also not ubiquitous [networkupsto…
ee9ff63 
…ols#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/subdriver/gen-snmp-subdriver.sh: avoid "GREP -e", it is also …
8b038f4 
…not ubiquitous [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/subdriver/gen-snmp-subdriver.sh: avoid grep for char classes,…
dee6505 
… it is also not ubiquitous [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/subdriver/gen-snmp-subdriver.sh, scripts/subdriver/gen-usbhid…
f24a859 
…-subdriver.sh: add a fallback mktemp implementation [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/subdriver/gen-usbhid-subdriver.sh: quote calls to mktemp [net…
ba8fd03 
…workupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
configure.ac, m4/ax_realpath.m4: introduce a fallback "mktemp" [netwo…
8658f62 
…rkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh, scripts/subdriver/gen-snmp-subdriver.sh, scripts/subdriv…
c5c54df 
…er/gen-usbhid-subdriver.sh: add a fallback TOUPPER/TOLOWER implementation [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/python/Makefile.am: add a fallback TOUPPER/TOLOWER implementa…
ff3b9f5 
…tion [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: work around lack of "find -maxdepth" [networkupstools#3099]
330220c 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: work around NCPUS prefixed with white-space [networkupst…
5b91be7 
…ools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
ci_build.sh: detect_platform_PKG_CONFIG_PATH_and_FLAGS(): fix use of …
30bb844 
…PKG_CONFIG variable [networkupstools#3099]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Makefile.am: work around lack of "id -u" [networkupstools#3099]
4b661d8 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov merged commit a456b00 into networkupstools:master Oct 2, 2025
30 checks passed
@jimklimov jimklimov deleted the issue-3099 branch October 2, 2025 08:50
This was referenced Feb 8, 2026
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

CI Entries related to continuous integration infrastructure (here CI = tools + scripts + recipes) portability We want NUT to build and run everywhere possible Solaris/illumos Solaris and illumos systems (OpenIndiana, OmniOS, SmartOS, TribbliX...)

Projects

None yet

Milestone

2.8.5

Development

Successfully merging this pull request may close these issues.

3 participants

@jimklimov @AppVeyorBot @nbriggs