From 615af428a30e0d22c80dcb3db64e92147779c7e0 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Fri, 2 Oct 2020 16:31:28 -0400 Subject: [PATCH] Windows CNI install script using lowercase "destdir" Fixes packaging via GH Actions script, which sets DESTDIR and is used across many scripts. Signed-off-by: Phil Estes --- script/setup/install-cni-windows | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/setup/install-cni-windows b/script/setup/install-cni-windows index 455c75644..146f8ebe8 100755 --- a/script/setup/install-cni-windows +++ b/script/setup/install-cni-windows @@ -16,8 +16,8 @@ set -eu -o pipefail -destdir="${destdir:-"C:\\Program Files\\containerd"}" -WINCNI_BIN_DIR="${destdir}/cni" +DESTDIR="${DESTDIR:-"C:\\Program Files\\containerd"}" +WINCNI_BIN_DIR="${DESTDIR}/cni" WINCNI_PKG=github.com/Microsoft/windows-container-networking WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2 @@ -29,7 +29,7 @@ install -D -m 755 "out/nat.exe" "${WINCNI_BIN_DIR}/nat.exe" install -D -m 755 "out/sdnbridge.exe" "${WINCNI_BIN_DIR}/sdnbridge.exe" install -D -m 755 "out/sdnoverlay.exe" "${WINCNI_BIN_DIR}/sdnoverlay.exe" -CNI_CONFIG_DIR="${destdir}/cni/conf" +CNI_CONFIG_DIR="${DESTDIR}/cni/conf" mkdir -p "${CNI_CONFIG_DIR}" # split_ip splits ip into a 4-element array.