From 087e2785fcc34104cae252c58590fb9e35d63910 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 7 Sep 2018 14:21:47 +0000 Subject: [PATCH] [projects|projs]-dirs.mk: Beautify convenience targets Add target edit-% and rename git-echo-link-% to git-echo-links-%. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 08dd2d6d..c9005d92 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -112,6 +112,7 @@ CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-bu LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-cvs-files.sh /opt/jw-build/bin/list-cvs-files.sh) list-cvs-files-not-found) JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jannet /opt/jw-build/bin/jannet) jannet-not-found) BROWSER ?= xdg-open +EDITOR ?= xdg-open GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh @@ -262,7 +263,7 @@ git-show-non-master-branches: # git-echo-link- returns a string functioning as hyperlink to # matching files in git, if embedded into a janware wiki or ticket. -git-echo-link-%: | $(TEXT_FILES_CACHE) +git-echo-links-%: | $(TEXT_FILES_CACHE) sed "/$*$$/!d; s%$(CWD)%%; s|^|\n \[\[jgit>/proj/$(JANWARE_USER)/|; s/$$/|$*\]\]\n/" $(TEXT_FILES_CACHE) pull-%: $(SSH_WRAPPER_SH) @@ -295,6 +296,9 @@ git-update-project-descriptions: $(SSH_WRAPPER_SH) projects.txt: echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@ +edit-%: | $(TEXT_FILES_CACHE) + $(EDITOR) $(shell grep "/$*$$" $(TEXT_FILES_CACHE)) + done.clean: rm -f *.done