virtctl.sh: Call appropriate binary by architecture

In particular, call the Darwin executable if run in MacOS. Signed-off-by: Ben Warren <bawarren@cisco.com>
kubevirt · Jul 19, 2018 · dabf2e0 · dabf2e0
1 parent 6338f16
commit dabf2e0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/cluster/virtctl.sh b/cluster/virtctl.sh
@@ -24,4 +24,17 @@ source $(dirname "$0")/../hack/common.sh
 source ${KUBEVIRT_DIR}/cluster/$KUBEVIRT_PROVIDER/provider.sh
 source ${KUBEVIRT_DIR}/hack/config.sh
 
-${KUBEVIRT_DIR}/_out/cmd/virtctl/virtctl --kubeconfig=${kubeconfig} "$@"
+CONFIG_ARGS=
+
+if [ -n "$kubeconfig" ]; then
+    CONFIG_ARGS="--kubeconfig=${kubeconfig}"
+elif [ -n "$KUBECONFIG" ]; then
+    CONFIG_ARGS="--kubeconfig=${KUBECONFIG}"
+fi
+
+VIRTCTL=virtctl
+if [ "$(uname -s)" = "Darwin" ]; then
+    VIRTCTL='virtctl-darwin'
+fi
+
+${KUBEVIRT_DIR}/_out/cmd/virtctl/${VIRTCTL} $CONFIG_ARGS "$@"
diff --git a/hack/build-go.sh b/hack/build-go.sh
@@ -96,6 +96,9 @@ for arg in $args; do
             if [ "${BIN_NAME}" = "virtctl" ]; then
                 GOOS=darwin GOARCH=amd64 go build -i -o ${CMD_OUT_DIR}/${BIN_NAME}/${ARCH_BASENAME}-darwin-amd64 -ldflags "$(kubevirt::version::ldflags)" $(pkg_dir darwin amd64)
                 GOOS=windows GOARCH=amd64 go build -i -o ${CMD_OUT_DIR}/${BIN_NAME}/${ARCH_BASENAME}-windows-amd64.exe -ldflags "$(kubevirt::version::ldflags)" $(pkg_dir windows amd64)
+                # Create symlinks to the latest binary of each architecture
+                (cd ${CMD_OUT_DIR}/${BIN_NAME} && ln -sf ${ARCH_BASENAME}-darwin-amd64 ${BIN_NAME}-darwin)
+                (cd ${CMD_OUT_DIR}/${BIN_NAME} && ln -sf ${ARCH_BASENAME}-windows-amd64.exe ${BIN_NAME}-windows.exe)
             fi
         )
     else