From 4d62039dd4bd181789485b31ca00fe6d9e3ef2c0 Mon Sep 17 00:00:00 2001 From: KaMeHb-UA Date: Fri, 23 Aug 2024 19:57:22 +0300 Subject: [PATCH 1/2] build: return `.gitkeep` file after removing assets to prevent Git see the deletion --- scripts/prepare-web.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/prepare-web.sh b/scripts/prepare-web.sh index 70b15a246..c53136a37 100755 --- a/scripts/prepare-web.sh +++ b/scripts/prepare-web.sh @@ -1,5 +1,7 @@ #!/bin/sh -ve rm -r assets/js/package +mkdir -p assets/js/package +touch assets/js/package/.gitkeep OLM_VERSION=$(cat pubspec.yaml | yq .dependencies.flutter_olm) DOWNLOAD_PATH="https://github.com/famedly/olm/releases/download/v$OLM_VERSION/olm.zip" From bd41aeb45ec48b94a5950542076820809a7cd419 Mon Sep 17 00:00:00 2001 From: KaMeHb-UA Date: Sat, 24 Aug 2024 12:21:51 +0300 Subject: [PATCH 2/2] fix: use raw `yq` query result (formatted one may result in `"d.d.d"` string on some systems) --- scripts/prepare-web.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare-web.sh b/scripts/prepare-web.sh index c53136a37..f55e5ed2d 100755 --- a/scripts/prepare-web.sh +++ b/scripts/prepare-web.sh @@ -3,7 +3,7 @@ rm -r assets/js/package mkdir -p assets/js/package touch assets/js/package/.gitkeep -OLM_VERSION=$(cat pubspec.yaml | yq .dependencies.flutter_olm) +OLM_VERSION=$(cat pubspec.yaml | yq -r .dependencies.flutter_olm) DOWNLOAD_PATH="https://github.com/famedly/olm/releases/download/v$OLM_VERSION/olm.zip" cd assets/js/ && curl -L $DOWNLOAD_PATH > olm.zip && cd ../../