janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

Remove /srv/git from janware Git URLs

Browse source 
git.janware.com has /srv/git removed from its Git URLs, follow suit.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-04-12 13:46:02 +02:00
commit d8653ac486
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/git-submod.mk
View file

@ -10,7 +10,7 @@ endif
SUBMOD_SRC_DIR ?= . SUBMOD_SRC_DIR ?= .
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER_PREFIX)git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh
GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/srv/git/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME) GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME)
SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(CWD)/$(SUBMOD_SRC_DIR))) SUBMOD_PATH = $(patsubst $(abspath $(TOPDIR))/%,%,$(abspath $(CWD)/$(SUBMOD_SRC_DIR)))
SUB_GIT = git -C $(SUBMOD_SRC_DIR) SUB_GIT = git -C $(SUBMOD_SRC_DIR)

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

@ -29,7 +29,7 @@ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
endif endif
endif endif
ifneq ($(findstring ssh://git.janware.com/srv/git,$(PROJECTS_DIR_REMOTE_BASE)),) ifneq ($(findstring ssh://git.janware.com/,$(PROJECTS_DIR_REMOTE_BASE)),)
$(warning Using janware private SSH: $(PROJECTS_DIR_REMOTE_BASE)) $(warning Using janware private SSH: $(PROJECTS_DIR_REMOTE_BASE))
PROJECTS_DIR_REMOTE_USER_SUBPATH ?= /proj PROJECTS_DIR_REMOTE_USER_SUBPATH ?= /proj
else ifneq ($(findstring ssh://git.janware.com,$(PROJECTS_DIR_REMOTE_BASE)),) else ifneq ($(findstring ssh://git.janware.com,$(PROJECTS_DIR_REMOTE_BASE)),)

2
make/topdir.mk
View file

@ -37,7 +37,7 @@ endif
include $(JWBDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
REMOTE_GIT_DIR = /srv/git/$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT) REMOTE_GIT_DIR = /$(JANWARE_USER)/$(REMOTE_GIT_FLAVOUR)/$(PROJECT)
REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR) REMOTE_GIT_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com$(REMOTE_GIT_DIR)
ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifneq ($(DONT_CHECK_PREREQ_DONE),true)

2
scripts/pgit.sh
View file

@ -312,7 +312,7 @@ log "JW_PKG_SSH_EXTRA_OPTS=$JW_PKG_SSH_EXTRA_OPTS"
cur=0 cur=0
SSH=ssh SSH=ssh
[ "$GIT_SSH" ] && SSH=$GIT_SSH [ "$GIT_SSH" ] && SSH=$GIT_SSH
global_remote_base="ssh://git.janware.com/srv/git" global_remote_base="ssh://git.janware.com"
while [ "${1:0:1}" = - ]; do while [ "${1:0:1}" = - ]; do
case "$1" in case "$1" in