bootstrap-initrd

commit: 64e7ed5fcac3237f52ec709141ab95649164e33a
parent ee302dec1aa5efb7fba44bc71330ca89245dbfca
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sat,  4 May 2024 17:02:35 +0200

Get proper sort from heirloom for now

Diffstat:
M
README.md
2
+-
M
init.sh
7
+++++--

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ Meanwhile:
 - GNU m4: Not even close
 - OpenBSD m4 aka om4: Requires a more modern lex than heirloom-devtools provides
 
-### Heirloom (toolchest) diff
+### Heirloom (toolchest) diff, sort
 Slighly messy Makefiles but only has few dependencies.
 
 ### Heirloom (toolchest) tar
diff --git a/init.sh b/init.sh
@@ -32,7 +32,7 @@ build_stubs() {
 	done
 	ln -s grep /bin/egrep || die
 	ln -s grep /bin/fgrep || die
-	ln -s /utils-std-*/cmd/cat /bin/sort || die
+	ln -s /utils-std-*/cmd/cat /usr/bin/sort || die
 }
 
 build_bmake() {
@@ -90,12 +90,15 @@ build_hierloom_devtools() {
 build_hierloom() {
 	cd /heirloom-0*/
 	mkdir -p /usr/5bin /usr/5lib /etc/default
-	for cmd in libcommon diff tar
+	for cmd in libcommon diff tar sort
 	do
 		bmake "$cmd/Makefile"
 		bmake CC=$CC AR="ar" RANLIB=true -C "$cmd"
 		bmake CC=$CC AR="ar" RANLIB=true -C "$cmd" install
 	done
+	ln -s /usr/5bin/sort /bin/sort
+	# Remove sort stub
+	test -L /usr/bin/sort && rm /usr/bin/sort
 }
 
 build_utils_std() {