From 8477f45390a4b2a098a21a3691cdb37b8cb8d4e9 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 12 Apr 2017 18:21:20 +0000
Subject: [PATCH] projects-dir.mk, projs-dir.mk, pgit.sh: Set CVS_RSH
 unconditionally to wrapper

Problem is, the OS cvs package sets the environment variable to "ssh"
in a profile script. Overriding this to speed things up.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/projects-dir.mk | 15 +++++----------
 scripts/pgit.sh      |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index e27c8531..3c9587e4 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -39,16 +39,11 @@ ifeq ($(JANWARE_USER),)
   export JANWARE_USER = $(shell id -un)
 endif
 
+CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+
 export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs
-
-ifeq ($(CVS_RSH),)
-  export CVS_RSH := ./ssh-wrapper.sh
-endif
-
-ifeq ($(GIT_SSH),)
-  export GIT_SSH := $(CVS_RSH)
-endif
-
+export CVS_RSH := $(CWD)/ssh-wrapper.sh
+export GIT_SSH := $(CVS_RSH)
 export JW_BUILD_SSH_EXTRA_OPTS = -o ControlMaster=auto -o ControlPath=/tmp/%r@build:%p -o ControlPersist=3m
 
 ifneq ($(CLONE_FROM_USER),)
@@ -106,7 +101,7 @@ init-project-%:
 	$(CREATE_PROJECT_SH) $*
 
 doc-project doc-module:
-	$(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(firstword $(MAKEFILE_LIST))))
+	$(BROWSER) $(firstword $(shell sed '/https:/ !d; s%.*https%https%; s/ .*//' $(lastword $(MAKEFILE_LIST))))
 
 pkg-%: pull.done
 	$(BUILD_PY) $@ $(BUILD_PROJECTS)
diff --git a/scripts/pgit.sh b/scripts/pgit.sh
index c91614a9..f465fd49 100644
--- a/scripts/pgit.sh
+++ b/scripts/pgit.sh
@@ -41,7 +41,7 @@ run()
 	config
 	cd $pdir
 
-	#set -e
+	set -e
 	for d in $pdirs; do
 		marker $d
 		git -C $d $cmd "$@"