Browse Source

Merge branch 'master' into feat/toleration/control_plane

pull/1275/head
louiznk 5 years ago committed by GitHub
parent
commit
45ab3e54ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      install.sh
  2. 2
      package/rpm/install.sh

2
install.sh

@ -307,7 +307,7 @@ get_release_version() {
VERSION_K3S=$(curl -w '%{url_effective}' -I -L -s -S ${GITHUB_URL}/latest -o /dev/null | sed -e 's|.*/||') VERSION_K3S=$(curl -w '%{url_effective}' -I -L -s -S ${GITHUB_URL}/latest -o /dev/null | sed -e 's|.*/||')
;; ;;
wget) wget)
VERSION_K3S=$(wget -SqO /dev/null ${GITHUB_URL}/latest 2>&1 | grep Location | sed -e 's|.*/||') VERSION_K3S=$(wget -SqO /dev/null ${GITHUB_URL}/latest 2>&1 | grep -i Location | sed -e 's|.*/||')
;; ;;
*) *)
fatal "Incorrect downloader executable '$DOWNLOADER'" fatal "Incorrect downloader executable '$DOWNLOADER'"

2
package/rpm/install.sh

@ -354,7 +354,7 @@ get_release_version() {
VERSION_K3S=$(curl -w '%{url_effective}' -I -L -s -S ${GITHUB_URL}/latest -o /dev/null | sed -e 's|.*/||') VERSION_K3S=$(curl -w '%{url_effective}' -I -L -s -S ${GITHUB_URL}/latest -o /dev/null | sed -e 's|.*/||')
;; ;;
wget) wget)
VERSION_K3S=$(wget -SqO /dev/null ${GITHUB_URL}/latest 2>&1 | grep Location | sed -e 's|.*/||') VERSION_K3S=$(wget -SqO /dev/null ${GITHUB_URL}/latest 2>&1 | grep -i Location | sed -e 's|.*/||')
;; ;;
*) *)
fatal "Incorrect downloader executable '$DOWNLOADER'" fatal "Incorrect downloader executable '$DOWNLOADER'"

Loading…
Cancel
Save