prefer gnu coreutils

goblinhack · Jan 8, 2025 · 29c1d26 · 29c1d26
1 parent ea2bde7
commit 29c1d26
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/build/build.sh b/build/build.sh
@@ -50,6 +50,10 @@ fi
 [ "$DISTRO" == "" ] && export DISTRO=$UNAME
 unset UNAME
 
+# Prefer gnu over freebsd coreutils
+PATH=/opt/local/libexec/gnubin/head:$PATH
+
+export PATH
 log_info "Distro                     : $DISTRO"
 
 help_full()

diff --git a/build/format.sh b/build/format.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# Prefer gnu over freebsd coreutils
+PATH=/opt/local/libexec/gnubin/head:$PATH
+export PATH
+
 for i in *.cpp *.hpp
 do
   case $i in

diff --git a/build/shell_source.sh b/build/shell_source.sh
@@ -5,6 +5,10 @@
 # Use "do" as the first arg if the output looks sane.
 #
 
+# Prefer gnu over freebsd coreutils
+PATH=/opt/local/libexec/gnubin/head:$PATH
+export PATH
+
 PRE=$(mktemp) || exit 1
 PAYLOAD=$(mktemp) || exit 1
 SHELL=$(mktemp) || exit 1
@@ -26,7 +30,7 @@ do
         continue
       fi
 
-      sed "1,/begin shell marker${WHICH}/!d" $IN | head -n -1 - > $PRE
+      sed "1,/begin shell marker${WHICH}/!d" $IN | head -n -1 > $PRE
       sed "/begin shell marker${WHICH}/,/end shell marker${WHICH}/!d" $IN | grep "\* shell" | sed -e 's/\/\* shell //g' -e 's/\*\/$//g' > $PAYLOAD
       sed "/begin shell marker${WHICH}/,/end shell marker${WHICH}/!d" $IN | grep "shell" | grep -v "end shell marker${WHICH}" > $SHELL
       sed "/end shell marker${WHICH}/,\$!d" $IN | tail -n +2 > $POST

diff --git a/build/tidy_source.sh b/build/tidy_source.sh
@@ -5,6 +5,10 @@
 # Use "do" as the first arg if the output looks sane.
 #
 
+# Prefer gnu over freebsd coreutils
+PATH=/opt/local/libexec/gnubin/head:$PATH
+export PATH
+
 PRE=$(mktemp) || exit 1
 PAYLOAD=$(mktemp) || exit 1
 POST=$(mktemp) || exit 1