jmm/kiwi-scp
2
0
Fork 0
Code Projects Wiki Activity

Update Makefile

Browse source 
Remove unused `bash` call, correct suffix removal
This commit is contained in:
Jörn-Michael Miehe 2019-10-15 21:53:41 +02:00 committed by GitHub
parent d3434557fc
commit 9910619bf1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -3,13 +3,13 @@
DOCKER:=docker DOCKER:=docker
DOCKER_COMPOSE:=docker-compose DOCKER_COMPOSE:=docker-compose
docker_bash=bash -c '$(1)' docker_bash=$(1)
# Check if needs root privileges? # Check if needs root privileges?
PRIVGROUP:=docker PRIVGROUP:=docker
ifneq ($(findstring $(PRIVGROUP),$(shell groups)),$(PRIVGROUP)) ifneq ($(findstring $(PRIVGROUP),$(shell groups)),$(PRIVGROUP))
DOCKER:=sudo $(DOCKER) DOCKER:=sudo $(DOCKER)
docker_bash=sudo $(docker_bash) docker_bash=sudo bash -c '$(1)'
endif endif
######### #########
@ -60,7 +60,7 @@ FILE_DOCKERNET:=$(CONF_TARGETROOT)/up-$(CONF_DOCKERNET)
# project directory handling # project directory handling
PROJ_WILDC:=$(wildcard *$(PROJ_SUFFX)) PROJ_WILDC:=$(wildcard *$(PROJ_SUFFX))
PROJ_NAMES:=$(basename $(PROJ_WILDC)) PROJ_NAMES:=$(patsubst %$(PROJ_SUFFX),%,$(PROJ_WILDC))
######### #########
# FUNCTIONS # FUNCTIONS
@ -70,7 +70,7 @@ PROJ_NAMES:=$(basename $(PROJ_WILDC))
# - with sourced *.conf files # - with sourced *.conf files
# - with COMPOSE_PROJECT_NAME, CONFDIR and TARGETDIR set # - with COMPOSE_PROJECT_NAME, CONFDIR and TARGETDIR set
kiwicompose=$(call docker_bash,\ kiwicompose=$(call docker_bash,\
cd "$(<)"; \ cd "$<"; \
$(CONF_SOURCE) \ $(CONF_SOURCE) \
COMPOSE_PROJECT_NAME="$(patsubst %$(PROJ_SUFFX),%,$<)" \ COMPOSE_PROJECT_NAME="$(patsubst %$(PROJ_SUFFX),%,$<)" \
CONFDIR="$(CONF_TARGETROOT)/conf" \ CONFDIR="$(CONF_TARGETROOT)/conf" \
@ -247,4 +247,4 @@ services:
- default - default
- hubnet - hubnet
[...] [...]
endef endef