From fe81bd209ed4fa4a3998d52fa7be65e6120aa788 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 18 Nov 2025 15:44:57 +0100 Subject: [PATCH] projects-dir[-minimal].mk: Don't default JANWARE_USER Do not set JANWARE_USER to $(id -un) in case it's undefined. Instead, rely on it being set explicitly in the environment if so desired. Signed-off-by: Jan Lindemann --- make/projects-dir-minimal.mk | 6 ------ make/projects-dir.mk | 11 ++--------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk index 13be892a..c6cc457a 100644 --- a/make/projects-dir-minimal.mk +++ b/make/projects-dir-minimal.mk @@ -22,12 +22,6 @@ JWBDIR_GIT_REMOTE ?= ssh://$(JANWARE_USER)@git.janware.com/srv/git/jan JWBDIR ?= $(notdir $(JWBDIR_GIT_REMOTE)) PROJECTS_DIR_INCLUDE_MK = $(JWBDIR)/make/projects-dir-include.mk -ifndef JANWARE_USER - JANWARE_USER = $(shell id -un) - $(warning Assuming JANWARE_USER=$(JANWARE_USER) from id -un) - $(warning Explicitly set environment variable JANWARE_USER to turn off this warning!) -endif - -include local.mk all: diff --git a/make/projects-dir.mk b/make/projects-dir.mk index b36ef45e..e52cac6d 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -65,19 +65,12 @@ EXCLUDES_FILES = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/d ifneq ($(EXCLUDES_FILES),) EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES)) endif +OFFLINE ?= false OFFLINE_PROJECTS ?= $(EXCLUDE_FROM_BUILD) TEXT_FILES_CACHE ?= text-files.txt -ifndef JANWARE_USER - JANWARE_USER := $(shell id -un) - $(warning Assuming JANWARE_USER=$(JANWARE_USER) from id -un) - $(warning Explicitly set environment variable JANWARE_USER to turn off this warning!) -endif - -ifeq ($(JANWARE_USER),) - OFFLINE ?= true -else +ifneq ($(origin JANWARE_USER),undefined) export JANWARE_USER PGIT_SH_CLONE += --create-remote-user-repos endif