janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 05:37:38 +01:00
Code Activity

fix: Pre-set CVSROOT could break build process if local system user != \$JANWARE_USER

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-12-06 17:44:10 +00:00
commit e7fe51e6a2
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
make/projects-dir.mk
View file

@ -46,22 +46,15 @@ ifeq ($(JANWARE_USER),)
export JANWARE_USER = $(shell id -un) export JANWARE_USER = $(shell id -un)
endif endif
export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
export CVS_RSH = ssh
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)
export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER) export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER)
else else
export PGIT_CLONE_FROM_USER=$(JANWARE_USER) export PGIT_CLONE_FROM_USER=$(JANWARE_USER)
endif endif
ifeq ($(CVSROOT),)
CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
export CVSROOT
endif
ifeq ($(CVS_RSH),)
CVS_RSH = ssh
export CVS_RSH
endif
# ------------ commands # ------------ commands
PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found) PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found)