Merge branch 'trunk' into develop

4f9aacb3 · Maarten L. Hekkelman · 85885406 · 05cfa921 · 4f9aacb3 · 4f9aacb3
Commit 4f9aacb3 authored Jan 25, 2023 by Maarten L. Hekkelman
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

include/cif++/condition.hpp
+0 -0

tools/update-libcifpp-data.in
+4 -1

No files found.
--- a/include/cif++/condition.hpp
+++ b/include/cif++/condition.hpp
--- a/tools/update-libcifpp-data.in
+++ b/tools/update-libcifpp-data.in
@@ -2,7 +2,10 @@

 set -e

-if [ "$EUID" -ne 0 ]
+# Get the effective UID, but do so in a compatible way (we may be running dash)
+euid=${EUID:-$(id -u)}
+
+if [ "${euid}" -ne 0 ] ; then
 	then echo "Please run as root"
 	exit
 fi