From 04989c47a225c48a403333e0093833797feef435 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Wed, 10 Jan 2024 16:14:59 +0300 Subject: [PATCH] cleanup... Signed-off-by: Alex A. Naanou --- .pct-helpers | 6 ++++++ Makefile | 21 +++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.pct-helpers b/.pct-helpers index 63234f9..03bb87d 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -147,6 +147,12 @@ normpath(){ # see: # https://pve.proxmox.com/wiki/Linux_Container getLatestTemplate(){ + if [ $DRY_RUN ] ; then + [ -z $2 ] \ + || eval "$2=${CT_TEMPLATE:-\\\$CT_TEMPLATE}" + return + fi + #IFS=$'\n' #@ pveam update diff --git a/Makefile b/Makefile index db6cf2d..6a6f38c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,8 @@ +%.srv: + $*/make.sh + config.global: config.global.example vim "+0r config.global.example" $@ @@ -14,28 +17,22 @@ gate: ./gate-traefik .PHONY: ns -ns: - $@/make.sh +ns: ns.srv .PHONY: ssh -ssh: - $@/make.sh +ssh: ssh.srv .PHONY: wireguard -wireguard: - $@/make.sh +wireguard: wireguard.srv .PHONY: syncthing -syncthing: - $@/make.sh +syncthing: syncthing.srv .PHONY: nextcloud -nextcloud: - $@/make.sh +nextcloud: nextcloud.srv .PHONY: gitea -gitea: - $@/make.sh +gitea: gitea.srv .PHONY: all