From dff8b3d2d9b89176af41f795c8e4a45176f8927b Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gbeutner@serenityos.org>
Date: Fri, 30 Jul 2021 18:22:40 +0200
Subject: Meta: Make rsync a hard dependency and remove the fallback code

Previously we'd fall back to using cp if rsync wasn't available. Not
only is this considerably slower it also breaks when some of the files
in the target directory are symlinks because cp tries to dereference
them.

Fixes #8672.
---
 Meta/build-root-filesystem.sh | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'Meta/build-root-filesystem.sh')

diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index 185c9b31db..64006129de 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -32,19 +32,16 @@ fi
 umask 0022
 
 printf "installing base system... "
-if command -v rsync >/dev/null; then
-    if rsync --chown 2>&1 | grep "missing argument" >/dev/null; then
-        rsync -aH --chown=0:0 --inplace "$SERENITY_SOURCE_DIR"/Base/ mnt/
-        rsync -aH --chown=0:0 --inplace Root/ mnt/
-    else
-        rsync -aH --inplace "$SERENITY_SOURCE_DIR"/Base/ mnt/
-        rsync -aH --inplace Root/ mnt/
-        chown -R 0:0 mnt/
-    fi
+if ! command -v rsync >/dev/null; then
+    die "Please install rsync."
+fi
+
+if rsync --chown 2>&1 | grep "missing argument" >/dev/null; then
+    rsync -aH --chown=0:0 --inplace "$SERENITY_SOURCE_DIR"/Base/ mnt/
+    rsync -aH --chown=0:0 --inplace Root/ mnt/
 else
-    echo "Please install rsync to speed up image creation times, falling back to cp for now"
-    $CP -PdR "$SERENITY_SOURCE_DIR"/Base/* mnt/
-    $CP -PdR Root/* mnt/
+    rsync -aH --inplace "$SERENITY_SOURCE_DIR"/Base/ mnt/
+    rsync -aH --inplace Root/ mnt/
     chown -R 0:0 mnt/
 fi
 SERENITY_ARCH="${SERENITY_ARCH:-i686}"
-- 
cgit v1.2.3