From b83e676695082a1efa51ee912eefaa8dd06be28d Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:45:54 +0100 Subject: [PATCH] chore: Use `cp --update=none` instead of `cp -n` --- modules/brew/brew.sh | 2 +- modules/yafti/yafti.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/brew/brew.sh b/modules/brew/brew.sh index bb9c188..8502df7 100644 --- a/modules/brew/brew.sh +++ b/modules/brew/brew.sh @@ -110,7 +110,7 @@ ConditionPathExists=!/var/home/linuxbrew/.linuxbrew [Service] Type=oneshot -ExecStart=/usr/bin/cp -R -n /usr/share/homebrew/home/linuxbrew/.linuxbrew /var/home/linuxbrew +ExecStart=/usr/bin/cp -R --update=none /usr/share/homebrew/home/linuxbrew/.linuxbrew /var/home/linuxbrew ExecStart=/usr/bin/chown -R 1000:1000 /var/home/linuxbrew ExecStart=/usr/bin/touch /etc/.linuxbrew diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh index a35fd8f..64fd17a 100644 --- a/modules/yafti/yafti.sh +++ b/modules/yafti/yafti.sh @@ -9,8 +9,8 @@ FIRSTBOOT_DATA="/usr/share/ublue-os/firstboot" mkdir -p "$FIRSTBOOT_DATA/launcher/" -# doesn't overwrite user's yafti.yml (ignores error) -cp -n "$MODULE_DIRECTORY/yafti/yafti.yml" "$FIRSTBOOT_DATA/yafti.yml" || true +# doesn't overwrite user's yafti.yml +cp --update=none "$MODULE_DIRECTORY/yafti/yafti.yml" "$FIRSTBOOT_DATA/yafti.yml" cp -r "$MODULE_DIRECTORY/yafti/launcher/" "$FIRSTBOOT_DATA" FIRSTBOOT_SCRIPT="${FIRSTBOOT_DATA}/launcher/login-profile.sh"