prefer gnu coreutils

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

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build/build.sh b/build/build.sh
@@ -51,7 +51,7 @@ fi
 unset UNAME
 
 # Prefer gnu over freebsd coreutils
-PATH=/opt/local/libexec/gnubin/head:$PATH
+PATH=/opt/local/libexec/gnubin:$PATH
 
 export PATH
 log_info "Distro                     : $DISTRO"

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

diff --git a/build/shell_source.sh b/build/shell_source.sh
@@ -6,7 +6,7 @@
 #
 
 # Prefer gnu over freebsd coreutils
-PATH=/opt/local/libexec/gnubin/head:$PATH
+PATH=/opt/local/libexec/gnubin:$PATH
 export PATH
 
 PRE=$(mktemp) || exit 1
@@ -30,10 +30,10 @@ 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
+      sed "/end shell marker${WHICH}/,\$!d" $IN | tail -n +2 - > $POST
       cat $PRE > $OUT
       cat $SHELL >> $OUT
       sh $PAYLOAD >> $OUT

diff --git a/build/tidy_source.sh b/build/tidy_source.sh
@@ -6,7 +6,7 @@
 #
 
 # Prefer gnu over freebsd coreutils
-PATH=/opt/local/libexec/gnubin/head:$PATH
+PATH=/opt/local/libexec/gnubin:$PATH
 export PATH
 
 PRE=$(mktemp) || exit 1
@@ -25,8 +25,8 @@ do
     for WHICH in 1 2 3 4 5 6 7 8 9
     do
       sed "1,/begin sort marker${WHICH}/!d" $IN > $PRE
-      sed "/begin sort marker${WHICH}/,/end sort marker${WHICH}/!d" $IN | tail -n +1 | grep -v "sort marker" | sort > $PAYLOAD
-      sed "/end sort marker${WHICH}/,\$!d" $IN | tail -n +1 > $POST
+      sed "/begin sort marker${WHICH}/,/end sort marker${WHICH}/!d" $IN | tail -n +1 - | grep -v "sort marker" | sort > $PAYLOAD
+      sed "/end sort marker${WHICH}/,\$!d" $IN | tail -n +1 - > $POST
       sort $PAYLOAD | uniq > $PAYLOAD.tmp
       mv $PAYLOAD.tmp $PAYLOAD
       cat $PRE $PAYLOAD $POST > $OUT