From bbb48d18e8c2c63c64a4a70ec5fa7bb0f6a77081 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Wed, 14 Feb 2024 20:40:47 +0000 Subject: [PATCH] escape --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9b1c6ee..36b5e15 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,8 @@ image_repo = ghcr.io/ublue-os image_name = base-main variant = Server -image_repo_escaped = $(shell echo $(image_repo) | sed 's/\//\\\//g') +image_repo_escaped = $(subst /,\/,$(image_repo)) +image_repo_double_escaped = $(subst /,\/,$(image_repo_escaped)) deploy.iso: boot.iso xorriso/input.txt $(image_name)-$(version) xorriso -dialog on < xorriso/input.txt @@ -34,10 +35,10 @@ install-deps: lorax_templates/%.tmpl: lorax_templates/%.tmpl.in - sed 's/@IMAGE_NAME@/$(image_name)/' lorax_templates/$*.tmpl.in > lorax_templates/$*.tmpl - sed 's/@IMAGE_REPO@/$(image_repo)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl - sed 's/@VERSION@/$(version)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl - sed 's/@IMAGE_REPO_ESCAPED@/$(image_repo_escaped)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl + sed 's/@IMAGE_NAME@/$(image_name)/' lorax_templates/$*.tmpl.in > lorax_templates/$*.tmpl + sed 's/@IMAGE_REPO@/$(image_repo_escaped)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl + sed 's/@VERSION@/$(version)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl + sed 's/@IMAGE_REPO_ESCAPED@/$(image_repo_double_escaped)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl