From 046df01415d52989c3e86b135c4deac972fe9134 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Tue, 1 Oct 2019 09:52:30 +0200 Subject: [PATCH] build.sh: Fix double || --- Changelog-mastofe.txt | 4 ++++ build.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog-mastofe.txt b/Changelog-mastofe.txt index 141a58ac8..9feb8694f 100644 --- a/Changelog-mastofe.txt +++ b/Changelog-mastofe.txt @@ -1,4 +1,8 @@ # MastoFE Changelog Note: This file is to be cleared after each rebase on upstream +Fixed +----- +- build.sh: Double `||` before `die "…"` when copying sw.js + Based on 65db9df011a3e13efa79f4e56343aa69bdad7716 2019-09-30T23:29:55Z diff --git a/build.sh b/build.sh index daefacca7..dce5a9672 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ yarn install -D || die "Installing dependencies via yarn failed" rm -rf public/packs public/assets env -i "PATH=$PATH" npm run build || die "Building the frontend failed" -cp public/assets/sw.js "${TARGET}/${static_dir}/sw.js" || || die "installing sw.js (service-worker) failed" +cp public/assets/sw.js "${TARGET}/${static_dir}/sw.js" || die "installing sw.js (service-worker) failed" rm -rf "${TARGET}/${static_dir}/packs" || die "Removing old assets in priv/static/packs failed" cp -r public/packs "${TARGET}/${static_dir}/packs" || die "Copying new assets in priv/static/packs failed" rm -rf "${TARGET}/${static_dir}/emoji/*.svg" || die "Removing the old emoji assets failed"