From bfdc2452da7de2eed85243c44199305ff2fb3844 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Wed, 25 Sep 2024 20:59:09 -0700 Subject: [PATCH] client: src: lib_gen: filter custom Dockerfile's .in files Adds filter to remove noisy license clutter in custom Dockerfile output. This is needed because of the amount of `edit` used on the file. The license still applies, regardless. --- client/src/docker/lib/internal/lib_gen.bash | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/client/src/docker/lib/internal/lib_gen.bash b/client/src/docker/lib/internal/lib_gen.bash index f43014f..da23470 100644 --- a/client/src/docker/lib/internal/lib_gen.bash +++ b/client/src/docker/lib/internal/lib_gen.bash @@ -455,7 +455,6 @@ function lib_gen::__gen_client() local _confirm="${_read:-y}" if [[ "$_confirm" == [yY] || -z "$global_arg_confirm" ]]; then cp -a "$global_custom_dockerfile" "${global_custom_dockerfile}_${global_suffix}" || lib_utils::die_fatal - cp -fa "$global_repo_custom_dockerfile" "$global_custom_dockerfile" || lib_utils::die_fatal fi else lib_utils::print_custom " \e[32m│\e[0m\n" @@ -463,10 +462,16 @@ function lib_gen::__gen_client() lib_utils::print_debug "$global_repo_custom_dockerfile" lib_utils::print_debug "$global_custom_dockerfile" - - cp -a "$global_repo_custom_dockerfile" "$global_custom_dockerfile" fi + # Filter to de-clutter output file (license cleanup) + local -r _filter="1,17d" + + sed \ + -e "$_filter" \ + -e "s:@DOCKER_FINANCE_VERSION@:${global_client_version}:g" \ + "$global_repo_custom_dockerfile" >"$global_custom_dockerfile" || lib_utils::die_fatal + lib_utils::print_custom " \e[32m│ └─\e[34m Edit file now? [Y/n] \e[0m" lib_gen::__gen_edit "$global_custom_dockerfile" fi