diff --git a/hack/install-edge.sh b/hack/install-edge.sh index 700a9da9..87fc5b3c 100644 --- a/hack/install-edge.sh +++ b/hack/install-edge.sh @@ -13,8 +13,8 @@ if [ "$EUID" -ne 0 ]; then exit fi -has_yum() { - [ -n "$(command -v yum)" ] +has_dnf() { + [ -n "$(command -v dnf)" ] } has_apt_get() { @@ -37,9 +37,8 @@ install_required_packages() { # reference: https://github.com/openfaas/faasd/pull/237 apt-get update -yq apt-get install -yq curl runc bridge-utils iptables iptables-persistent - elif $(has_yum); then - yum check-update -y - yum install -y curl runc iptables-services which + elif $(has_dnf); then + dnf install -y curl runc iptables-services which elif $(has_pacman); then pacman -Syy pacman -Sy curl runc bridge-utils @@ -60,6 +59,7 @@ if [ -z "$SKIP_OS" ]; then install_required_packages fi +echo "" echo "2. Downloading OCI image, and installing pre-requisites" echo "" if [ ! -x "$(command -v arkade)" ]; then @@ -95,6 +95,17 @@ ${BINLOCATION}arkade oci install --path ${tmpdir} \ cd ${tmpdir} ./install.sh ./ +if has_dnf; then + isRhelLike=true +else + isRhelLike=false +fi + +binaryName="faasd" +if [ "$isRhelLike" = true ]; then + binaryName="/usr/local/bin/faasd" +fi + echo "" echo "3.1 Commercial users can create their license key as follows:" echo "" @@ -103,12 +114,12 @@ echo "sudo nano /var/lib/faasd/secrets/openfaas_license" echo "" echo "3.2 For personal, non-commercial use only, GitHub Sponsors of @openfaas (25USD+) can run:" echo "" -echo "sudo -E faasd github login" -echo "sudo -E faasd activate" +echo "sudo -E ${binaryName} github login" +echo "sudo -E ${binaryName} activate" echo "" echo "4. Then perform the final installation steps" echo "" -echo "sudo -E sh -c \"cd ${tmpdir}/var/lib/faasd && faasd install\"" +echo "sudo -E sh -c \"cd ${tmpdir}/var/lib/faasd && ${binaryName} install\"" echo "" echo "5. Refer to the complete handbook and supplementary documentation at:" echo ""