janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 23:23:55 +01:00
Code Activity

projects-dir.mk: Replace mimencode by base64

Browse source 
Use base64 instead of mimencode utility to en-/decode
bootstrap CVS directory, in the hope to better support
Ubuntu, which lacks mimencode.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-01-11 13:38:51 +00:00
commit 25c2583c45
1 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
make/projects-dir.mk
View file

@ -1,16 +1,16 @@
# ------------ initial CVS subdir # ------------ initial CVS subdir
define CVSDIR_MIME = define CVSDIR_MIME =
QlpoOTFBWSZTWSqR0W8AALh/ks+QASBAAf/yb9JbRH9/32AMACAICEhAAjxQBTCUkmTEZGh6 QlpoOTFBWSZTWWJXrDwAALh/ks+QASBAAf/yX0pbRH9/32AMACAICEhAAjxTRLQJSU0MQ0ZGg0NA
gAAAAA0AGgHMAmAmRgBGJiYTCYIaYmmBzAJgJkYARiYmEwmCGmJpgFURNE2k1NGlPT1NJmoH NAABoAYgEoKZqaUZAGIaADQMCAyAGhzCYBMAJhMJpgAAEyaaBgqiIBTU8TQJpiaD1A000NBtQZBp
qDRtBPSY0I9TR6n6p8j3nf86/pWteXvN7hPE0JUJ5YTMwTtERHTg8nDZ0+T+jE0KkjIqYGLY 6n3Pqd34r6q1rp7jU4p2m4SoTphMzBOYREcazicanaSYFSRyFSwyWry+k1mk8FxGIRIi3mcu7s14
j68pmazwxI0CJEWvZzd3Xhgtn9ms8+kQrl216NSKHhymW4MJOHhtxqk83C6M+7jCRlKVA7Df 2XTclqxiGevXXfzEUO/G9pLy18RsGVPNLwrkuTDKRZSlOMwwMQJTB6g4CkUsCBwEb5QQSdHs6fd8
cvI+EtcgH0UyCAsieckg3yQUPRw8/p9vb2/xsP1JIXJN0ih1fV6N8RKTFNHLz5E+WlejKqqY fl1/PA6SSGRJEm/zzG9nNLlt4+bA5eGliSzcFOglxEOpQlCcxMZVZCFsFBaS1ahpTLYOJOgkrVZd
uMqecnZPYRJtmvih5oUUMDStS9ojVghha1bbdCfGv+Q/43GyGhbYV1msRrKmYwK81tDV1MsY WlOoD+DIxNBSklznplYwKIlRNcjVdbDcUWXoXBUzUMLixVoSiM+DqyZl5dPUqYRGJYZlzElgviit
vfKFMq3Iuknk3aVdmV4mtG3PsX2ozRgRqMyMqYItEYzFCJU1vuLIrEUiio5Ga2JgzuWL4riY 1xKt9IqrbFGckvqrFw8kGqHCGgFgUJxaEokJQTYmqJYIUJI6KjDLJpOQFkqxIR4t6nC78vJUCYda
Mr1WyjFSxU2M7kXLmO3DGq1LZ3VK9V8/v+7Ajs3ePwceOyrpxxcKeomsJk7hNPaJQ2nw9MQ3 7+mnTW5enMuNjE1hMmwTT6CUMx2e+IaBd7cjYX9dS3stdgij8qBNgeI9ZMCMfEzt0WyJ0E5kmAGI
DH9rncZeypb3eb5H0/zuoE7B2i0DQRFcTJBKgPSwTie7gOeQW6t9tQJQKw5ESj6OT/d7c8F2 gdZdavkjhKwzolGxn/upod7Jqa8YLVthaltxJq2iwovo18A5HatmlIpTU3W0WN4uMfA1g/4u5Ipw
915wWWwLJccyauIwKMqOvoHe8qZtFKU3uZxFnOWM9XWDYXckU4UJAqkdFvA== oSDEr1h4
endef endef
define newline define newline
@ -68,6 +68,7 @@ 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/ytools/bin/purge-stale-projects.sh) purge-not-found) PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/ytools/bin/purge-stale-projects.sh) purge-not-found)
RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found) RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build-release.sh /opt/ytools/bin/build-release.sh) release-not-found)
BROWSER ?= firefox BROWSER ?= firefox
THIS_MAKEFILE = $(lastword $(MAKEFILE_LIST))
# ------------ targets # ------------ targets
@ -182,13 +183,19 @@ links.done:
cvsdir.done: cvsdir.done:
if [ ! -d CVS ]; then \ if [ ! -d CVS ]; then \
echo -e '$(subst $(newline),\n,${CVSDIR_MIME})' | mimencode -u | tar -xjf - ;\ echo -e '$(subst $(newline),\n,${CVSDIR_MIME})' | base64 -d | tar -xjf - ;\
fi fi
if grep -q "^:ext:jan@cvs.jannet.de:" CVS/Root; then \ if grep -q "^:ext:jan@cvs.jannet.de:" CVS/Root; then \
echo $(CVSROOT) > CVS/Root ;\ echo $(CVSROOT) > CVS/Root ;\
fi fi
touch $@ touch $@
re-encode:
tar -cjf - CVS | base64 | \
sed '/^define CVSDIR_MIME =/,/^endef/ {//!d}; /^define CVSDIR_MIME =/r/dev/stdin' \
$(THIS_MAKEFILE) > $(THIS_MAKEFILE).tmp
mv $(THIS_MAKEFILE).tmp $(THIS_MAKEFILE)
cvs-update.done: cvsdir.done cvs-update.done: cvsdir.done
cvs update -dP $(CVS_PROJECTS) cvs update -dP $(CVS_PROJECTS)
touch $@ touch $@