refactor(tool): Read .fvmrc file

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Feb 26, 2024 · 7a6faca · 7a6faca
1 parent a819d28
commit 7a6faca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.cspell/tools.txt b/.cspell/tools.txt
@@ -22,6 +22,7 @@ exiftool
 extglob
 freedesktop
 fullpath
+fvmrc
 gboolean
 gchar
 genhtml

diff --git a/tool/build-app.sh b/tool/build-app.sh
@@ -36,7 +36,7 @@ if [[ "$target" == "linux/arm64" ]] || [[ "$target" == "linux/amd64" ]]; then
   --platform "$target" \
   --progress plain \
   --tag "$tag"  \
-  --build-arg="FLUTTER_VERSION=$(jq ".flutterSdkVersion" -r < .fvm/fvm_config.json | cut -d "@" -f 1)" \
+  --build-arg="FLUTTER_VERSION=$(jq ".flutter" -r < .fvmrc)" \
   $(cache_build_args "$tag") \
   -f "tool/build/Dockerfile.$os" \
   ./tool/build
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ exiftool @@
     extglob
     freedesktop
     fullpath
+    fvmrc
     gboolean
     gchar
     genhtml
@@ Expand Down @@