janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

jcs.mk: Try to fix jcs not in PATH after sudo

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

19
conf/jcs/jcs.mk
View file

@ -12,6 +12,7 @@ INF := $(wildcard *.inf)
INF_DONE := $(addsuffix .done,$(basename $(INF)))
INF_SU_DONE := $(addsuffix .su_done,$(basename $(INF)))
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
@ -30,11 +31,11 @@ define recurse_subdirs
endef
%.done: %.inf
sudo jcs install $<
sudo $(JCS) install $<
touch $@
%.su_done: %.inf
sudo jcs install -b setup -f $<
sudo $(JCS) install -b setup -f $<
touch $@
install_inf: $(INF_DONE)
@ -42,7 +43,7 @@ install_inf: $(INF_DONE)
install_inf.old: checkroot checkdirs
@echo "####" checking installation information files ... ;\
if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
sudo jcs install *.inf ;\
sudo $(JCS) install *.inf ;\
fi | $(TEE) -a $(INSTALL_LOG)
install_link:
@ -50,7 +51,7 @@ install_link:
install_link.old: checkroot checkdirs
@echo "####" checking link information files ... ;\
if [ -e link.sh ] ; then \
jcs linkout link.sh -b install ;\
$(JCS) linkout link.sh -b install ;\
fi | $(TEE) -a $(INSTALL_LOG)
setup_inf: $(INF_SU_DONE)
@ -58,30 +59,30 @@ setup_inf: $(INF_SU_DONE)
setup_inf.old: checkroot checkdirs
@echo "####" checking installation information files ... ;\
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)
setup_link: checkroot checkdirs
@echo "####" checking link information files ... ;\
if [ -e link.sh ] ; then \
jcs linkout -f -b setup link.sh ;\
$(JCS) linkout -f -b setup link.sh ;\
fi | $(TEE) -a $(SETUP_LOG)
test_inf: checkdirs
@echo "####" testing installation information files ... ;\
if [ -n "`find . -name '*.inf' -maxdepth 1`" ] ; then \
sudo jcs install *.inf -t ;\
sudo $(JCS) install *.inf -t ;\
fi | $(TEE) -a $(INSTALL_LOG)
test_link: checkdirs
@echo "####" testing link information files ... ;\
if [ -e link.sh ] ; then \
jcs linkout -t link.sh ;\
$(JCS) linkout -t link.sh ;\
fi | $(TEE) -a $(INSTALL_LOG)
get: checkdirs
@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)
$(recurse_subdirs)