From 7e13cc2ca8e27a7b9cb0832dec9bfed7b4bc2e36 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Thu, 29 Oct 2020 21:10:12 +0200
Subject: [PATCH] Fix install script
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
README.md | 3 +--
install/README.md | 6 +++---
install/flux.sh | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index c3b29786..f0e68098 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,11 @@ Flux v2 is constructed with the [GitOps Toolkit](#gitops-toolkit), a
set of composable APIs and specialized tools for building Continuous
Delivery on top of Kubernetes.
-## `flux` installation
+## Flux installation
With Homebrew:
```sh
-brew tap fluxcd/tap
brew install fluxcd/tap/flux
```
diff --git a/install/README.md b/install/README.md
index fd04a4f1..99bb0487 100644
--- a/install/README.md
+++ b/install/README.md
@@ -6,7 +6,7 @@ Binaries for macOS and Linux AMD64 are available for download on the
To install the latest release run:
```bash
-curl -s https://raw.githubusercontent.com/fluxcd/flux2/master/install/flux.sh | sudo bash
+curl -s https://raw.githubusercontent.com/fluxcd/flux2/main/install/flux.sh | sudo bash
```
The install script does the following:
@@ -27,10 +27,10 @@ Clone the repository:
```bash
git clone https://github.com/fluxcd/flux2
-cd toolkit
+cd flux2
```
-Build the `flux` binary (requires go >= 1.14):
+Build the `flux` binary (requires go >= 1.15):
```bash
make build
diff --git a/install/flux.sh b/install/flux.sh
index a744187e..416ea096 100755
--- a/install/flux.sh
+++ b/install/flux.sh
@@ -119,7 +119,7 @@ download() {
# Download hash from Github URL
download_hash() {
- HASH_URL="https://github.com/${GITHUB_REPO}/releases/download/v${VERSION_FLUX}/toolkit_${VERSION_FLUX}_checksums.txt"
+ HASH_URL="https://github.com/${GITHUB_REPO}/releases/download/v${VERSION_FLUX}/flux2_${VERSION_FLUX}_checksums.txt"
info "Downloading hash ${HASH_URL}"
download "${TMP_HASH}" "${HASH_URL}"
HASH_EXPECTED=$(grep " flux_${VERSION_FLUX}_${OS}_${ARCH}.tar.gz$" "${TMP_HASH}")
--
GitLab