janware/jw-pkg
1
Code Pull requests Activity Actions

make / scripts: git.janware.com -> devgit.janware.com

Browse source 
janware upstream development server moved from git.janware.com to devgit.janware.com. This commit follows the move with pretty much a simple
	s/git.janware.com/devgit.janware.com/
over jw-pkg. It found 14 matches, that's pretty bad.
FIXME: Reduce the redundancy, or, better, replace the devgit.janware.com goodies by a more generally useful concept altogether.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-05-12 15:09:37 +02:00
commit f6f6e56943
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/git-submod.mk
View file

@ -9,8 +9,8 @@ ifeq ($(USE_USER_URL),true)
endif 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)devgit.janware.com /opt/jw-pkg/bin/git-srv-admin.sh
GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)git.janware.com/$(JANWARE_USER)/contrib/$(SUBMOD_PKG_NAME) GIT_REPO_URL = ssh://$(JANWARE_USER_PREFIX)devgit.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)

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

@ -29,10 +29,10 @@ ifeq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
endif endif
endif endif
ifneq ($(findstring ssh://git.janware.com/,$(PROJECTS_DIR_REMOTE_BASE)),) ifneq ($(findstring ssh://devgit.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://devgit.janware.com,$(PROJECTS_DIR_REMOTE_BASE)),)
$(warning Using janware SSH: $(PROJECTS_DIR_REMOTE_BASE)) $(warning Using janware SSH: $(PROJECTS_DIR_REMOTE_BASE))
else ifneq ($(findstring https://,$(PROJECTS_DIR_REMOTE_BASE)),) else ifneq ($(findstring https://,$(PROJECTS_DIR_REMOTE_BASE)),)
$(warning Using HTTPS: $(PROJECTS_DIR_REMOTE_BASE)) $(warning Using HTTPS: $(PROJECTS_DIR_REMOTE_BASE))

2
make/projects-dir.mk
View file

@ -141,7 +141,7 @@ endif
PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_PKG_BINDIR)/purge-stale-projects.sh) purge-not-found) PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_PKG_BINDIR)/purge-stale-projects.sh) purge-not-found)
CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg-create-project.sh $(JW_PKG_BINDIR)/jw-pkg-create-project.sh) jw-pkg-create-project-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg-create-project.sh $(JW_PKG_BINDIR)/jw-pkg-create-project.sh) jw-pkg-create-project-not-found)
LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh $(JW_PKG_BINDIR)/scm.sh) scm-sh-not-found) ls-files LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh $(JW_PKG_BINDIR)/scm.sh) scm-sh-not-found) ls-files
GIT_SRV_ADMIN_SH = $(GIT_SSH) $(JANWARE_USER)@git.janware.com $(JW_PKG_REMOTE_BINDIR)/git-srv-admin.sh GIT_SRV_ADMIN_SH = $(GIT_SSH) $(JANWARE_USER)@devgit.janware.com $(JW_PKG_REMOTE_BINDIR)/git-srv-admin.sh
JANWARE_PACKAGE_FILTER = url =~ janware JANWARE_PACKAGE_FILTER = url =~ janware
# ------------ projects to be built # ------------ projects to be built

6
make/topdir.mk
View file

@ -38,7 +38,7 @@ endif
include $(JWBDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
REMOTE_GIT_DIR = /$(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)devgit.janware.com$(REMOTE_GIT_DIR)
ifneq ($(DONT_CHECK_PREREQ_DONE),true) ifneq ($(DONT_CHECK_PREREQ_DONE),true)
ifndef PREREQ ifndef PREREQ
@ -149,7 +149,7 @@ git-config:
git remote -v | grep -q "^origin *$(REMOTE_GIT_URL)" || git remote set-url --push origin $(REMOTE_GIT_URL) git remote -v | grep -q "^origin *$(REMOTE_GIT_URL)" || git remote set-url --push origin $(REMOTE_GIT_URL)
git-clone-to-remote: git-clone-to-remote:
ssh $(JANWARE_USER)@git.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(PROJECT)" ssh $(JANWARE_USER)@devgit.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(PROJECT)"
make git-config make git-config
git push --set-upstream origin $(GIT_MAIN_BRANCH) git push --set-upstream origin $(GIT_MAIN_BRANCH)
git push --all $(REMOTE_GIT_URL) git push --all $(REMOTE_GIT_URL)
@ -165,7 +165,7 @@ git-init-remote: git-import git-clone-to-remote
git-descr: $(GIT_DESCR) git-descr: $(GIT_DESCR)
git-update-project-description: git-update-project-description:
ssh $(JANWARE_USER)@git.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)" ssh $(JANWARE_USER)@devgit.janware.com "/opt/jw-pkg/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)"
projects-%: projects-%:
$(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py projects build $* $(PROJECT) $(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py projects build $* $(PROJECT)

6
scripts/pgit.sh
View file

@ -223,7 +223,7 @@ cmd_get()
shift shift
done done
local git_srv_admin="$SSH $remote_user@git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh" local git_srv_admin="$SSH $remote_user@devgit.janware.com /opt/jw-pkg/bin/git-srv-admin.sh"
local from_user="${refspec[0]}" local from_user="${refspec[0]}"
[ "$from_user" ] || from_user=$whoami [ "$from_user" ] || from_user=$whoami
@ -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" global_remote_base="ssh://devgit.janware.com"
while [ "${1:0:1}" = - ]; do while [ "${1:0:1}" = - ]; do
case "$1" in case "$1" in
@ -328,7 +328,7 @@ while [ "${1:0:1}" = - ]; do
done done
# Only janware.com ssh git supports subdirectories below users # Only janware.com ssh git supports subdirectories below users
if [[ "$global_remote_base" =~ git.janware.com ]]; then if [[ "$global_remote_base" =~ devgit.janware.com ]]; then
global_remote_subpath="/proj" global_remote_subpath="/proj"
else else
global_remote_subpath="" global_remote_subpath=""

4
scripts/purge-stale-projects.sh
View file

@ -76,7 +76,7 @@ ssh="$ssh -l $JANWARE_USER"
for vcs in $vcss; do for vcs in $vcss; do
case "$vcs" in case "$vcs" in
cvs|CVS) host=cvs.janware.com;; cvs|CVS) host=cvs.janware.com;;
git|Git) host=git.janware.com;; git|Git) host=devgit.janware.com;;
esac esac
$ssh $host echo hallo >/dev/null 2>&1 || fatal "Can't ssh into host $host" $ssh $host echo hallo >/dev/null 2>&1 || fatal "Can't ssh into host $host"
done done
@ -112,7 +112,7 @@ for vcs in $vcss; do
;; ;;
git|Git) git|Git)
local_git_proj=`ls -d */.git 2>/dev/null | sed 's%/[^/]*%%'` local_git_proj=`ls -d */.git 2>/dev/null | sed 's%/[^/]*%%'`
remote_git_proj=`$ssh git.janware.com /opt/jw-pkg/bin/git-srv-admin.sh -j list-personal-projects` remote_git_proj=`$ssh devgit.janware.com /opt/jw-pkg/bin/git-srv-admin.sh -j list-personal-projects`
for p in $local_git_proj; do for p in $local_git_proj; do
[ -L $p ] && continue [ -L $p ] && continue
[ -d $p ] || continue [ -d $p ] || continue

2
src/python/jw/pkg/cmds/projects/CmdListRepos.py
View file

@ -31,7 +31,7 @@ class CmdListRepos(Cmd): # export
password = await get_password(args=args, url=args.base_url, askpass_env=askpass_env) password = await get_password(args=args, url=args.base_url, askpass_env=askpass_env)
match base_url.scheme: match base_url.scheme:
case 'ssh': case 'ssh':
if re.match(r'ssh://.*git\.janware\.com/', args.base_url): if re.match(r'ssh://.*devgit\.janware\.com/', args.base_url):
from jw.pkg.lib.ec.SSHClient import SSHClient, ssh_client from jw.pkg.lib.ec.SSHClient import SSHClient, ssh_client
if username is not None: if username is not None:
base_url.set_username(username) base_url.set_username(username)