fix: Dockerfile Makefile target calls

Signed-off-by: Vladislav Doster <mvdoster@gmail.com>

Dockerfile

@@ -34,14 +34,16 @@ RUN useradd \
 USER ${USER}
 WORKDIR ${HOME}
 
-RUN bash -c "mkdir ${HOME}/.config \
+RUN mkdir ${HOME}/.config \
   && git clone https://github.com/vladdoster/dotfiles ${HOME}/.config/dotfiles \
-  && pushd ${HOME}/.config/dotfiles \
-  && make stow/install \
-  && make install \
-  && popd \
-  && zsh"
+ && make -C ${HOME}/.config/dotfiles install/gnu-stow \
+ && make -C ${HOME}/.config/dotfiles install \
 
-USER ${USER}
+# WORKDIR ${HOME}/.config/dotfiles
+
+# RUN make -C ${HOME}/.config/dotfiles install/gnu-stow \
+#  && make -C ${HOME}/.config/dotfiles install \
+
+USER "$USER"
 
 CMD ["zsh"]

Makefile

@@ -61,7 +61,7 @@ install/all: python/prog rust/prog ## Install Python & Rust programs
 
 install/gnu-stow: ## Install GNU stow
 	$(info --- installing GNU Stow)
-	$(shell pushd ./bin/.local/bin; make stow)
+	cd ./bin/.local/bin && make stow
 	$(info --- installed GNU Stow)
 
 python/prog: ## Install useful Python programs

bin/.local/bin/Makefile

@@ -1,7 +1,8 @@
-.DEFAULT_GOAL := help
+ZSH := $(shell command -v zsh 2> /dev/null)
+.DEFAULT_SHELL := $(ZSH)
 .ONESHELL:
 
-ZSH := $(shell command -v zsh 2> /dev/null)
+.DEFAULT_GOAL := help
 
 zwc:
 	$(or $(ZSH),:) -fc 'for f in *.zsh; do zcompile -R -- $$f.zwc $$f || exit; done'
@@ -124,7 +125,7 @@ $(PROGS):
 	$(ZSH) \
 		$$PWD/installer \
 		$(@) \
-		"$(GNU)/$(@)/$(shell curl $(GNU)/$(@)/ | ggrep -oP "$(@)-[0-9]+(\.[0-9]+)*.tar\.gz" | sort -V -t. -r -k1,1 -k2,2 -k3,3 | head -1)" \
+		"$(GNU)/$(@)/$(shell curl $(GNU)/$(@)/ | ggrep -oP '$(@)-[0-9]+(\.[0-9]+)*.tar\.gz' | sort -V -t. -r -k1,1 -k2,2 -k3,3 | head -1)" \
 		$(OPTS)
 
 $(PY_PROGS):