janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 07:00:39 +01:00
Code Activity

jcs: Attempt to fix jcs not in sudo path

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-23 15:43:49 +00:00
commit 17ed23e423
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scripts/jcs
View file

@ -1920,6 +1920,7 @@ INF := $(wildcard *.inf)
INF_DONE := $(addsuffix .done,$(basename $(INF))) INF_DONE := $(addsuffix .done,$(basename $(INF)))
INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF))) INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF)))
JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path) JCS_HTTP_PATH := $(shell . /etc/jcs/jcs.conf; echo $$jcs_http_path)
JCS := /opt/jw-build/bin/jcs
export SETUP_LOG INSTALL_LOG TEE BINDIR SBINDIR export SETUP_LOG INSTALL_LOG TEE BINDIR SBINDIR
@ -1938,11 +1939,11 @@ define recurse_subdirs
endef endef
%.done: %.inf %.done: %.inf
sudo jcs install $< sudo $(JCS) install $<
touch $@ touch $@
%.su_done: %.inf %.su_done: %.inf
sudo jcs install -b setup -f $< sudo $(JCS) install -b setup -f $<
touch $@ touch $@
install_inf: $(INF_DONE) install_inf: $(INF_DONE)
@ -1950,7 +1951,7 @@ install_inf: $(INF_DONE)
install_inf.old: checkroot checkdirs install_inf.old: checkroot checkdirs
@echo "####" checking installation information files ... ;\ @echo "####" checking installation information files ... ;\
if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \ if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
sudo jcs install *.inf ;\ sudo $(JCS) install *.inf ;\
fi | $(TEE) -a $(INSTALL_LOG) fi | $(TEE) -a $(INSTALL_LOG)
install_link: install_link:
@ -1958,7 +1959,7 @@ install_link:
install_link.old: checkroot checkdirs install_link.old: checkroot checkdirs
@echo "####" checking link information files ... ;\ @echo "####" checking link information files ... ;\
if [ -e link.sh ] ; then \ if [ -e link.sh ] ; then \
jcs linkout link.sh -b install ;\ $(JCS) linkout link.sh -b install ;\
fi | $(TEE) -a $(INSTALL_LOG) fi | $(TEE) -a $(INSTALL_LOG)
setup_inf: $(INF_SU_DONE) setup_inf: $(INF_SU_DONE)
@ -1966,30 +1967,30 @@ setup_inf: $(INF_SU_DONE)
setup_inf.old: checkroot checkdirs setup_inf.old: checkroot checkdirs
@echo "####" checking installation information files ... ;\ @echo "####" checking installation information files ... ;\
if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \ if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
sudo jcs install -b setup -f *.inf ;\ sudo $(JCS) install -b setup -f *.inf ;\
fi | $(TEE) -a $(SETUP_LOG) fi | $(TEE) -a $(SETUP_LOG)
setup_link: checkroot checkdirs setup_link: checkroot checkdirs
@echo "####" checking link information files ... ;\ @echo "####" checking link information files ... ;\
if [ -e link.sh ] ; then \ if [ -e link.sh ] ; then \
jcs linkout -f -b setup link.sh ;\ $(JCS) linkout -f -b setup link.sh ;\
fi | $(TEE) -a $(SETUP_LOG) fi | $(TEE) -a $(SETUP_LOG)
test_inf: checkdirs test_inf: checkdirs
@echo "####" testing installation information files ... ;\ @echo "####" testing installation information files ... ;\
if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \ if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
sudo jcs install *.inf -t ;\ sudo $(JCS) install *.inf -t ;\
fi | $(TEE) -a $(INSTALL_LOG) fi | $(TEE) -a $(INSTALL_LOG)
test_link: checkdirs test_link: checkdirs
@echo "####" testing link information files ... ;\ @echo "####" testing link information files ... ;\
if [ -e link.sh ] ; then \ if [ -e link.sh ] ; then \
jcs linkout -t link.sh ;\ $(JCS) linkout -t link.sh ;\
fi | $(TEE) -a $(INSTALL_LOG) fi | $(TEE) -a $(INSTALL_LOG)
get: checkdirs get: checkdirs
@echo "####" getting files. ;\ @echo "####" getting files. ;\
if [ -n "$(GETFILES)" ] ; then jcs get $(GETFILES) ; fi if [ -n "$(GETFILES)" ] ; then $(JCS) get $(GETFILES) ; fi
getall: $(LOCAL_GET) get $(LOCAL_POST_GET) getall: $(LOCAL_GET) get $(LOCAL_POST_GET)
$(recurse_subdirs) $(recurse_subdirs)
@ -2058,7 +2059,7 @@ include /etc/jcs/jcs.mk
# jannet configuration shadow # jannet configuration shadow
# (c) 2000 jannet # (c) 2000 jannet
# contact@jannet.de # contact@jannet.de
MAKE_SH := jcs smake MAKE_SH := /opt/jw-build/bin/jcs smake
SUBDIRS = cur SUBDIRS = cur