From 11d583635d1bff08f643d48a6bd731d89dc2a938 Mon Sep 17 00:00:00 2001
From: jld3103 <jld3103yt@gmail.com>
Date: Thu, 21 Jul 2022 13:15:29 +0200
Subject: [PATCH] Always build openapi-generator when generating nextcloud
 clients

---
 tool/generate-nextcloud.sh | 5 +++++
 tool/install.sh            | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tool/generate-nextcloud.sh b/tool/generate-nextcloud.sh
index 382c6ad1..c565bfcf 100755
--- a/tool/generate-nextcloud.sh
+++ b/tool/generate-nextcloud.sh
@@ -94,6 +94,11 @@ function spec_templates_generate() {
   fvm dart packages/spec_templates/bin/generate.dart "$appdir" "$is_core"
 }
 
+(
+  cd external/openapi-generator
+  ./mvnw package -DskipTests -Dmaven.test.skip=true
+)
+
 rm -rf /tmp/nextcloud-neon
 mkdir -p /tmp/nextcloud-neon
 
diff --git a/tool/install.sh b/tool/install.sh
index 0578dc35..aa4541a8 100755
--- a/tool/install.sh
+++ b/tool/install.sh
@@ -6,9 +6,5 @@ git submodule init
 git submodule update
 fvm dart pub global activate mono_repo 6.3.0
 fvm dart pub global activate fvm 2.4.1
-fvm install
-(
-  cd external/openapi-generator
-  ./mvnw package -DskipTests -Dmaven.test.skip=true
-)
+yes | fvm install
 fvm exec mono_repo pub get