Testing auto-creation of subdirs

uniget-org · Apr 19, 2024 · 2b84785 · 2b84785
1 parent 38fbaa5
commit 2b84785
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 47 deletions.
diff --git a/tools/container2wasm/Dockerfile.template b/tools/container2wasm/Dockerfile.template
@@ -12,8 +12,7 @@ check-github-release-asset "ktock/container2wasm" "v${version}" "container2wasm-
 curl --silent --location --fail "https://github.com/ktock/container2wasm/releases/download/v${version}/container2wasm-v${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner
 
-mkdir -p "${prefix}/libexec/container2wasm"
 check-github-release-asset "ktock/container2wasm" "v${version}" "c2w-net-proxy.wasm"
-curl --silent --location --fail --output "${prefix}/libexec/container2wasm/c2w-net-proxy.wasm" \
+curl --silent --location --fail --output "${prefix}/libexec/container2wasm/c2w-net-proxy.wasm" --create-dirs \
     "https://github.com/ktock/container2wasm/releases/download/v${version}/c2w-net-proxy.wasm"
 EOF
diff --git a/tools/docker-preview/Dockerfile.template b/tools/docker-preview/Dockerfile.template
@@ -10,11 +10,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-mkdir -p \
-    "${prefix}/libexec/${name}/bin" \
-    "${prefix}${uniget_contrib}/${name}/sysvinit/debian" \
-    "${prefix}${uniget_contrib}/${name}/sysvinit/redhat" \
-    "${prefix}${uniget_contrib}/${name}/openrc"
+mkdir -p "${prefix}/libexec/${name}/bin"
 EOF
 
 COPY daemon.json /uniget_bootstrap/etc/docker-preview/
@@ -42,31 +38,31 @@ sed -i -n '/Requires=docker.socket/!p' "${prefix}/etc/systemd/system/docker.serv
 EOF
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker.default"
 echo "DOCKER_OPTS=--config-file=/etc/${name}/daemon.json" >>"${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
 sed -i -E "s|^(export PATH=)|\1/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 sed -i -E "s|^BASE=docker|BASE=${name}|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker.sysconfig"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
 sed -i -E "s|(^prog=)|export PATH="/libexec/${name}/bin:/sbin:/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 sed -i -E "s|/usr/bin/dockerd|/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
 sed -i "s|/usr/bin/dockerd|/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
 sed -i -E "s|^(command=)|export PATH="/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
 sed -i "s|/usr/bin/dockerd|/libexec/${name}/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"

diff --git a/tools/docker-stable/Dockerfile.template b/tools/docker-stable/Dockerfile.template
@@ -10,11 +10,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-mkdir -p \
-    "${prefix}/libexec/${name}/bin" \
-    "${prefix}${uniget_contrib}/${name}/sysvinit/debian" \
-    "${prefix}${uniget_contrib}/${name}/sysvinit/redhat" \
-    "${prefix}${uniget_contrib}/${name}/openrc"
+mkdir -p "${prefix}/libexec/${name}/bin"
 EOF
 
 RUN <<EOF
@@ -51,29 +47,29 @@ sed -i -n '/Requires=docker.socket/!p' "${prefix}/etc/systemd/system/docker.serv
 EOF
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker.default"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
 sed -i -E "s|^(export PATH=)|\1/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker.sysconfig"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
 sed -i -E "s|(^prog=)|export PATH="/libexec/${name}/bin:/sbin:/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 sed -i -E "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
 sed -i "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
 sed -i -E "s|^(command=)|export PATH="/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
 sed -i "s|/usr/bin/dockerd|/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"

diff --git a/tools/docker/Dockerfile.template b/tools/docker/Dockerfile.template
@@ -10,11 +10,7 @@ ARG name
 ARG version
 
 RUN <<EOF
-mkdir -p \
-    "${prefix}/libexec/${name}/bin" \
-    "${prefix}${uniget_contrib}/${name}/sysvinit/debian" \
-    "${prefix}${uniget_contrib}/${name}/sysvinit/redhat" \
-    "${prefix}${uniget_contrib}/${name}/openrc"
+mkdir -p "${prefix}/libexec/${name}/bin"
 EOF
 
 RUN <<EOF
@@ -49,29 +45,29 @@ sed -i -n '/Requires=docker.socket/!p' "${prefix}/etc/systemd/system/docker.serv
 EOF
 
 RUN <<EOF
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker.default" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker.default"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-debian/docker"
 sed -i -E "s|^(export PATH=)|\1/usr/local/libexec/${name}/bin:|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 sed -i -E "s|^DOCKERD=/usr/bin/dockerd|DOCKERD=/usr/local/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/debian/docker"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker.sysconfig" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker.sysconfig"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/sysvinit-redhat/docker"
 sed -i -E "s|(^prog=)|export PATH="/usr/local/libexec/${name}/bin:/sbin:/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 sed -i -E "s|/usr/bin/dockerd|/usr/local/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 chmod +x "${prefix}${uniget_contrib}/${name}/sysvinit/redhat/docker"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.confd" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.confd"
 sed -i "s|/usr/bin/dockerd|/usr/local/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.confd"
 
-curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" \
+curl --silent --location --fail --output "${prefix}${uniget_contrib}/${name}/openrc/docker.initd" --create-dirs \
     "https://github.com/moby/moby/raw/v${version}/contrib/init/openrc/docker.initd"
 sed -i -E "s|^(command=)|export PATH="/usr/local/libexec/${name}/bin:\${PATH}"\n\n\1|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"
 sed -i "s|/usr/bin/dockerd|/usr/local/bin/dockerd|" "${prefix}${uniget_contrib}/${name}/openrc/docker.initd"

diff --git a/tools/gitsign/Dockerfile.template b/tools/gitsign/Dockerfile.template
@@ -73,10 +73,9 @@ RUN <<EOF
 "${prefix}/bin/gitsign" completion zsh >"${prefix}/share/zsh/vendor-completions/_gitsign"
 EOF
 RUN <<EOF
-mkdir -p "${prefix}/etc/systemd/user"
-curl --silent --verbose --location --fail --output "${prefix}/etc/systemd/user/gitsign-credential-cache.service" \
+curl --silent --verbose --location --fail --output "${prefix}/etc/systemd/user/gitsign-credential-cache.service" --create-dirs \
     "https://github.com/sigstore/gitsign/raw/v${version}/contrib/systemd/gitsign-credential-cache.service"
-curl --silent --location --fail --output "${prefix}/etc/systemd/user/gitsign-credential-cache.socket" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/user/gitsign-credential-cache.socket" --create-dirs \
     "https://github.com/sigstore/gitsign/raw/v${version}/contrib/systemd/gitsign-credential-cache.socket"
 sed -i "s|ExecStart=%h/.local/bin/gitsign-credential-cache|ExecStart=/bin/gitsign-credential-cache|" "${prefix}/etc/systemd/user/gitsign-credential-cache.service"
 EOF
diff --git a/tools/kubefire/Dockerfile.template b/tools/kubefire/Dockerfile.template
@@ -17,8 +17,7 @@ EOF
 
 RUN <<EOF
 check-github-release-asset "innobead/kubefire" "v${version}" "kubefire-linux-${alt_arch}"
-mkdir -p "${prefix}/libexec/cni"
-curl --silent --location --fail --output "${prefix}/libexec/cni/host-local-rev" \
+curl --silent --location --fail --output "${prefix}/libexec/cni/host-local-rev" --create-dirs \
     "https://github.com/innobead/kubefire/releases/download/v${version}/host-local-rev-linux-${alt_arch}"
 chmod +x "${prefix}/libexec/cni/host-local-rev"
 EOF
diff --git a/tools/pacstall/Dockerfile.template b/tools/pacstall/Dockerfile.template
@@ -15,16 +15,15 @@ chmod +x "${prefix}/bin/pacstall"
 curl --silent --location --fail --output "${prefix}/share/man/man8/pacstall.8.gz" \
     "https://github.com/pacstall/pacstall/raw/${version}/misc/pacstall.8.gz"
 
-mkdir -p "${prefix}/share/pacstall/scripts"
 for script in add-repo checks dep-tree download error_log install-local query-info remove search update upgrade; do
-    curl --silent --location --fail --output "${prefix}/share/pacstall/scripts/${script}.sh" \
+    curl --silent --location --fail --output "${prefix}/share/pacstall/scripts/${script}.sh" --create-dirs \
         "https://github.com/pacstall/pacstall/raw/${version}/misc/scripts/${script}.sh"
     chmod +x "${prefix}/share/pacstall/scripts/${script}.sh"
 done
 
-curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/pacstall" \
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/pacstall" --create-dirs \
     "https://github.com/pacstall/pacstall/raw/${version}/misc/completion/bash"
-curl --silent --location --fail --output "${prefix}/share/fish/vendor_completions.d/pacstall.fish" \
+curl --silent --location --fail --output "${prefix}/share/fish/vendor_completions.d/pacstall.fish" --create-dirs \
     "https://github.com/pacstall/pacstall/raw/${version}/misc/completion/fish"
 
 mkdir -p "${prefix}/share/pacstall/repo"

diff --git a/tools/reptyr/Dockerfile.template b/tools/reptyr/Dockerfile.template
@@ -24,6 +24,6 @@ mkdir -p /opt/reptyr/bin /opt/reptyr/share/man/man1
 cp reptyr "${prefix}/bin/"
 cp reptyr.1 "${prefix}/share/man/man1/"
 
-curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/reptyr" \
+curl --silent --location --fail --output "${prefix}/share/bash-completion/completions/reptyr" --create-dirs \
     "https://github.com/nelhage/reptyr/raw/reptyr-${version}/reptyr.bash"
 EOF
diff --git a/tools/shortnames/Dockerfile.template b/tools/shortnames/Dockerfile.template
@@ -8,7 +8,6 @@ SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
-mkdir -p "${prefix}/etc/containers/registries.conf.d"
-curl --silent --location --fail --output "${prefix}/etc/containers/registries.conf.d/00-shortnames.conf" \
+curl --silent --location --fail --output "${prefix}/etc/containers/registries.conf.d/00-shortnames.conf" --create-dirs \
     "https://github.com/containers/shortnames/raw/v${version}/shortnames.conf"
 EOF