From aed3f768b29703de03f59d801068cab1c5bbcd47 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 30 Jun 2020 13:13:18 -0700 Subject: [PATCH 1/2] resolve issue where kubectl and other binaries not symlinked Signed-off-by: Brian Downs --- install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index b44d086bff..da1bd19924 100755 --- a/install.sh +++ b/install.sh @@ -383,7 +383,7 @@ download_hash() { fi info "downloading hash ${HASH_URL}" download "${TMP_HASH}" "${HASH_URL}" - HASH_EXPECTED=$(awk -F ' ' '{print $1}' ${TMP_HASH}) + HASH_EXPECTED=$(awk -F ' ' '{print $1}' "${TMP_HASH}") } # installed_hash_matches checks hash against @@ -481,8 +481,8 @@ download_and_verify() { # create_symlinks adds additional utility links. create_symlinks() { info "creating symlinks..." - for bin in $(readlink -f "${BASE_DIR}/data/**/bin/*"); do - ln -sf ${bin} "${INSTALL_PATH}/$(basename $bin)" + for bin in ${BASE_DIR}/data/*/bin/*; do + ln -sf "${bin}" "${INSTALL_PATH}"/"$(basename ${bin})" done } @@ -860,13 +860,13 @@ eval set -- $(escape "${INSTALL_RKE2_EXEC}") $(quote "$@") setup_env "$@" download_and_verify setup_selinux - create_symlinks create_killall create_uninstall systemd_disable create_env_file create_service_file service_enable_and_start + create_symlinks } exit 0 From 38340eb1979da143150ee2f1dbe363b96be434c2 Mon Sep 17 00:00:00 2001 From: Brian Downs Date: Tue, 30 Jun 2020 13:14:24 -0700 Subject: [PATCH 2/2] add build to .gitignore Signed-off-by: Brian Downs --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index fe1fc8c34e..69c5194850 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ .vscode /data rke2 +/build +