From bcb67222beb07d90383a282963694a7490647bd4 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 11 Apr 2017 19:15:58 +0000 Subject: [PATCH] projects-dir.mk: Use GIT_SSH instead of ssh to allow automatic build Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 069d6d7e..594f9fc5 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -33,6 +33,10 @@ ifeq ($(CVS_RSH),) export CVS_RSH = ssh endif +ifeq ($(GIT_SSH),) + export GIT_SSH = $(CVS_RSH) +endif + ifneq ($(CLONE_FROM_USER),) export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER) else @@ -51,8 +55,8 @@ BUILD_PY = python $(MOD_SCRIPT_DIR)/build.py -b $(shell pwd) $(BUILD_PY_EX PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/jw-build/bin/build-release.sh) release-not-found) BROWSER ?= firefox -GIT_SRV_ADMIN = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh -CVS_ADMIN = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh +GIT_SRV_ADMIN = $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh +CVS_ADMIN = $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh # ------------ targets