Skip to content

Commit 4bb1ec0

Browse files
committed
Proper case for DESTDIR so GH Actions configuration is used
Signed-off-by: Phil Estes <[email protected]>
1 parent 6eef06e commit 4bb1ec0

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

script/setup/install-cni-windows

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
set -eu -o pipefail
1818

19-
destdir="${destdir:-"C:\\Program Files\\containerd"}"
20-
WINCNI_BIN_DIR="${destdir}/cni"
19+
DESTDIR="${DESTDIR:-"C:\\Program Files\\containerd"}"
20+
WINCNI_BIN_DIR="${DESTDIR}/cni"
2121
WINCNI_PKG=github.com/Microsoft/windows-container-networking
2222
WINCNI_VERSION=aa10a0b31e9f72937063436454def1760b858ee2
2323

@@ -29,7 +29,7 @@ install -D -m 755 "out/nat.exe" "${WINCNI_BIN_DIR}/nat.exe"
2929
install -D -m 755 "out/sdnbridge.exe" "${WINCNI_BIN_DIR}/sdnbridge.exe"
3030
install -D -m 755 "out/sdnoverlay.exe" "${WINCNI_BIN_DIR}/sdnoverlay.exe"
3131

32-
CNI_CONFIG_DIR="${destdir}/cni/conf"
32+
CNI_CONFIG_DIR="${DESTDIR}/cni/conf"
3333
mkdir -p "${CNI_CONFIG_DIR}"
3434

3535
# split_ip splits ip into a 4-element array.

0 commit comments

Comments
 (0)