From 9fb781d7dbf652137f45d0b5b7024f7ed27c1882 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <akaster@serenityos.org>
Date: Sat, 4 Mar 2023 05:38:33 -0700
Subject: [PATCH] Base+Meta: Remove invalid symlinks from Base for more and env

These symlinks' only purpose was to be copied into the rootfs along with
the rest of Base. Instead of storing symlinks to files that either
don't exist in the Base directory, or point to an absolute path outside
of the serenity folder, move these symlinks into the
build-root-filesystem.sh script.
---
 Base/bin/more                 | 1 -
 Base/usr/bin/env              | 1 -
 Meta/build-root-filesystem.sh | 4 +++-
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 120000 Base/bin/more
 delete mode 120000 Base/usr/bin/env

diff --git a/Base/bin/more b/Base/bin/more
deleted file mode 120000
index cbce297ba8e..00000000000
--- a/Base/bin/more
+++ /dev/null
@@ -1 +0,0 @@
-/bin/less
\ No newline at end of file
diff --git a/Base/usr/bin/env b/Base/usr/bin/env
deleted file mode 120000
index 24234ae18e9..00000000000
--- a/Base/usr/bin/env
+++ /dev/null
@@ -1 +0,0 @@
-/bin/env
\ No newline at end of file
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index b152c120717..2e3a9100a67 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -134,7 +134,7 @@ chmod 755 mnt/res/devel/templates/*.postcreate
 echo "done"
 
 printf "creating initial filesystem structure... "
-for dir in bin etc proc mnt tmp boot mod var/run usr/local; do
+for dir in bin etc proc mnt tmp boot mod var/run usr/local usr/bin; do
     mkdir -p mnt/$dir
 done
 chmod 700 mnt/boot
@@ -200,6 +200,8 @@ echo "done"
 printf "installing shortcuts... "
 ln -sf Shell mnt/bin/sh
 ln -sf test mnt/bin/[
+ln -sf less mnt/bin/more
+ln -sf /bin/env mnt/usr/bin/env
 echo "done"
 
 printf "installing 'checksum' variants... "