diff --git a/latest/farmer b/latest/farmer index 7beda1f..f3b8b11 100755 --- a/latest/farmer +++ b/latest/farmer @@ -63,16 +63,16 @@ EOF trap 'rm -r "$tempdir"' EXIT case $machine_arch in "386") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_i386.tar.gz" > "$tempdir/gum.tar.gz" + curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.17.0/gum_0.17.0_Linux_i386.tar.gz" > "$tempdir/gum.tar.gz" ;; "amd64") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_x86_64.tar.gz" > "$tempdir/gum.tar.gz" + curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.17.0/gum_0.17.0_Linux_x86_64.tar.gz" > "$tempdir/gum.tar.gz" ;; "arm64") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_arm64.tar.gz" > "$tempdir/gum.tar.gz" + curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.17.0/gum_0.17.0_Linux_arm64.tar.gz" > "$tempdir/gum.tar.gz" ;; "arm") - curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.11.0/gum_0.11.0_Linux_arm.tar.gz" > "$tempdir/gum.tar.gz" + curl -f -L -s "https://github.com/charmbracelet/gum/releases/download/v0.17.0/gum_0.17.0_Linux_arm.tar.gz" > "$tempdir/gum.tar.gz" ;; esac tar -C "$tempdir" -xzf "$tempdir/gum.tar.gz" @@ -96,7 +96,7 @@ EOF if [ -z "$ADMIN_PUBKEYS" ]; then ADMIN_PUBKEYS=() while true; do - ADMIN_PUBKEYS+=($(gum input --width=57 --placeholder="ABC25HBCYNHYMIFTN372NCKASUQPJCTBA66GLKXFYM3QGRP42IC5BYYF" --prompt="Enter an admin public key (generated by 'grlx auth pubkey'): > ")) + ADMIN_PUBKEYS+=("$(gum input --width=57 --placeholder="ABC25HBCYNHYMIFTN372NCKASUQPJCTBA66GLKXFYM3QGRP42IC5BYYF" --prompt="Enter an admin public key (generated by 'grlx auth pubkey'): > ")") if ! gum confirm "Add another admin public key?"; then break fi @@ -105,7 +105,7 @@ EOF if [ -z "$CERT_HOSTS" ]; then CERT_HOSTS=() while true; do - CERT_HOSTS+=($(gum input --placeholder="mydomain.com" --prompt="Enter a domain or IP to generate a certificate for: > ")) + CERT_HOSTS+=("$(gum input --placeholder="mydomain.com" --prompt="Enter a domain or IP to generate a certificate for: > ")") if ! gum confirm "Add another domain or IP?"; then break fi diff --git a/latest/sprout b/latest/sprout index 22e716b..8d2a98b 100755 --- a/latest/sprout +++ b/latest/sprout @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -e -o pipefail +export PATH=$PATH:/usr/local/bin:/usr/sbin:/usr/bin arch=$(uname -m) @@ -8,7 +9,7 @@ case $arch in machine_arch="amd64" ;; "i686"|"i386") - machine_arch="x86" + machine_arch="386" ;; "aarch64"|"arm64"|"armv8") machine_arch="arm64"