janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

projects-dir[-minimal].mk: Don't default JANWARE_USER

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2025-11-18 15:44:57 +01:00
commit fe81bd209e
2 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/projects-dir-minimal.mk
View file

@ -22,12 +22,6 @@ JWBDIR_GIT_REMOTE ?= ssh://$(JANWARE_USER)@git.janware.com/srv/git/jan
JWBDIR ?= $(notdir $(JWBDIR_GIT_REMOTE)) JWBDIR ?= $(notdir $(JWBDIR_GIT_REMOTE))
PROJECTS_DIR_INCLUDE_MK = $(JWBDIR)/make/projects-dir-include.mk 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 -include local.mk
all: all:

11
make/projects-dir.mk
View file

@ -65,19 +65,12 @@ EXCLUDES_FILES = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/d
ifneq ($(EXCLUDES_FILES),) ifneq ($(EXCLUDES_FILES),)
EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES)) EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES))
endif endif
OFFLINE ?= false
OFFLINE_PROJECTS ?= $(EXCLUDE_FROM_BUILD) OFFLINE_PROJECTS ?= $(EXCLUDE_FROM_BUILD)
TEXT_FILES_CACHE ?= text-files.txt TEXT_FILES_CACHE ?= text-files.txt
ifndef JANWARE_USER ifneq ($(origin JANWARE_USER),undefined)
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
export JANWARE_USER export JANWARE_USER
PGIT_SH_CLONE += --create-remote-user-repos PGIT_SH_CLONE += --create-remote-user-repos
endif endif