more basename trickery

This commit is contained in:
2025-08-08 21:48:21 -05:00
parent 9365a60f87
commit 390d50e8cb

View File

@@ -84,7 +84,7 @@ docker_build_image() {
# docker expects colon instead of dash # docker expects colon instead of dash
dockerDistro="${distro//-/:}" dockerDistro="${distro//-/:}"
# specific file for evaluated package manager info # specific file for evaluated package manager info
distroPkgMgr="${DOCKER_DIR}/$(bash_basename "${distro}-pkg_mgr")" distroPkgMgr="${DOCKER_DIR}/$(bash_basename "${distro}")-pkg_mgr)"
# get package manager info # get package manager info
# TODO REMOVE # TODO REMOVE
@@ -109,7 +109,7 @@ docker_build_image() {
cat "${distroPkgMgr}" cat "${distroPkgMgr}"
source "${distroPkgMgr}" source "${distroPkgMgr}"
dockerfile="${DOCKER_DIR}/Dockerfile_${distro}" dockerfile="${DOCKER_DIR}/Dockerfile_$(bash_basename "${distro}")"
{ {
echo "FROM ${dockerDistro}" echo "FROM ${dockerDistro}"
echo 'SHELL ["/bin/bash", "-c"]' echo 'SHELL ["/bin/bash", "-c"]'