From 4f8d39f74af97156036e46a6e4460c7ded7cd94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 2 Feb 2024 22:37:28 +0100 Subject: [PATCH] Fix MSYS2 breaking the base URL for webapp Add `MSYS2_ARG_CONV_EXCL="*"` to avoid MSYS2 changing the yarn build `--base=/app/` argument. That's a URL path, not a filesystem path, and it should be used as-is on every platform. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c3e5a70a..4083af88 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ webapp-static: addon-packer # When changing the base URL, also update the line # e.GET("/app/*", echo.WrapHandler(webAppHandler)) # in `cmd/flamenco-manager/main.go` - yarn --cwd web/app build --outDir ../static --base=/app/ --logLevel warn + MSYS2_ARG_CONV_EXCL="*" yarn --cwd web/app build --outDir ../static --base=/app/ --logLevel warn # yarn --cwd web/app build --outDir ../static --base=/app/ --minify false ./addon-packer -filename ${WEB_STATIC}/flamenco-addon.zip @echo "Web app has been installed into ${WEB_STATIC}"