From 4747e8b79aec5b9ddc9c6f3f4fdfee31e134c88c Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Mon, 8 Nov 2021 14:48:24 +0100
Subject: [PATCH] disable install scripts and fix duplicate targets

---
 .make/docs.mk        | 9 +++++++--
 .make/l10n.mk        | 2 +-
 accounts/.yarnrc.yml | 3 +++
 idp/.yarnrc.yml      | 3 +++
 ocis-pkg/Makefile    | 6 ++----
 ocis/Makefile        | 7 ++-----
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.make/docs.mk b/.make/docs.mk
index b85cb5cb7c6..7bee2388a26 100644
--- a/.make/docs.mk
+++ b/.make/docs.mk
@@ -1,7 +1,12 @@
+
+SKIP_CONFIG_DOCS_GENERATE ?= 0
+CONFIG_DOCS_BASE_PATH ?= ../docs/extensions
+
 .PHONY: config-docs-generate
 config-docs-generate: $(FLAEX)
-	@echo "$(NAME): generating config docs"
-	@$(FLAEX) >| ../docs/extensions/$(NAME)/configuration.md
+	@if [ $(SKIP_CONFIG_DOCS_GENERATE) -eq 1 ]; then \
+		$(FLAEX) >| $(CONFIG_DOCS_BASE_PATH)/$(NAME)/configuration.md \
+	; fi;
 
 .PHONY: grpc-docs-generate
 grpc-docs-generate: buf-generate
diff --git a/.make/l10n.mk b/.make/l10n.mk
index 72d6f684ba2..7962af838f0 100644
--- a/.make/l10n.mk
+++ b/.make/l10n.mk
@@ -12,7 +12,7 @@ OUTPUT_DIR = ./l10n
 TEMPLATE_FILE = ./l10n/template.pot
 
 # Name of the generated .po files for each available locale.
-LOCALE_FILES = $(shell find l10n/locale -name '*.po')
+LOCALE_FILES = $(shell find l10n/locale -name '*.po' 2> /dev/null)
 
 .PHONY: l10n-push
 l10n-push:
diff --git a/accounts/.yarnrc.yml b/accounts/.yarnrc.yml
index 70af58a8405..b80dd2a73fa 100644
--- a/accounts/.yarnrc.yml
+++ b/accounts/.yarnrc.yml
@@ -1,3 +1,6 @@
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-3.1.0.cjs
+
+enableScripts: false
+enableTelemetry: false
diff --git a/idp/.yarnrc.yml b/idp/.yarnrc.yml
index 70af58a8405..b80dd2a73fa 100644
--- a/idp/.yarnrc.yml
+++ b/idp/.yarnrc.yml
@@ -1,3 +1,6 @@
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-3.1.0.cjs
+
+enableScripts: false
+enableTelemetry: false
diff --git a/ocis-pkg/Makefile b/ocis-pkg/Makefile
index 74493817512..166ea425259 100644
--- a/ocis-pkg/Makefile
+++ b/ocis-pkg/Makefile
@@ -15,15 +15,13 @@ include ../.make/go.mk
 include ../.make/release.mk
 
 ############ docs generate ############
+SKIP_CONFIG_DOCS_GENERATE = 1
+
 include ../.make/docs.mk
 
 .PHONY: docs-generate
 docs-generate:
 
-.PHONY: config-docs-generate
-config-docs-generate:
-	@echo "ocis-pkg: nothing to do"
-
 ############ generate ############
 include ../.make/generate.mk
 
diff --git a/ocis/Makefile b/ocis/Makefile
index ad4a635eb0c..cf10747a668 100644
--- a/ocis/Makefile
+++ b/ocis/Makefile
@@ -16,16 +16,13 @@ include ../.make/go.mk
 include ../.make/release.mk
 
 ############ docs generate ############
+CONFIG_DOCS_BASE_PATH := ../docs
+
 include ../.make/docs.mk
 
 .PHONY: docs-generate
 docs-generate: config-docs-generate
 
-.PHONY: config-docs-generate
-config-docs-generate: $(FLAEX)
-	@echo "$(NAME): generating config docs"
-	@$(FLAEX) >| ../docs/$(NAME)/configuration.md
-
 ############ dev-docker ############
 .PHONY: dev-docker
 dev-docker: