mirror of
https://github.com/empayre/fleet.git
synced 2024-11-06 00:45:19 +00:00
Website: update fleetctl preview instructions (#17302)
Closes: #17301 Changes: - Updated the terminal commands listed for macOS and Linux on the fleetctl preview page. - Renamed the `install-fleet.sh` script to be `install-fleetctl.sh` - Removed the portions of the `install-fleetctl` script that rely on user input, this script will now always install the latest version of `fleetctl` in the default directory.
This commit is contained in:
Eric
GitHub
parent
27544d726a
commit
86399a6e2f
119
website/assets/resources/install-fleet.sh
vendored
119
website/assets/resources/install-fleet.sh
vendored
@ -1,119 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
FLEETCTL_INSTALL_DIR="${HOME}/.fleetctl/"
|
||||
FLEETCTL_BINARY_NAME="fleetctl"
|
||||
|
||||
|
||||
# Check for necessary commands
|
||||
for cmd in curl tar grep sed; do
|
||||
if ! command -v $cmd &> /dev/null; then
|
||||
echo "Error: $cmd is not installed." >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Fetching the latest version of fleetctl..."
|
||||
|
||||
|
||||
# Fetch the latest version number from NPM
|
||||
latest_strippedVersion=$(curl -s "https://registry.npmjs.org/fleetctl/latest" | grep -o '"version": *"[^"]*"' | cut -d'"' -f4)
|
||||
echo "Latest version available on NPM: $latest_strippedVersion"
|
||||
|
||||
version_gt() {
|
||||
test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1";
|
||||
}
|
||||
|
||||
# Determine operating system (Linux or MacOS)
|
||||
OS="$(uname -s)"
|
||||
|
||||
case "${OS}" in
|
||||
Linux*) OS='linux';;
|
||||
Darwin*) OS='macos';;
|
||||
*) echo "Unsupported operating system: ${OS}"; exit 1;;
|
||||
esac
|
||||
|
||||
# Download the fleetctl binary and extract it into the install directory
|
||||
download_and_extract() {
|
||||
echo "Downloading fleetctl ${latest_strippedVersion} for ${OS}..."
|
||||
curl -sSL $DOWNLOAD_URL | tar -xz -C $FLEETCTL_INSTALL_DIR --strip-components=1 fleetctl_v${latest_strippedVersion}_${OS}/
|
||||
}
|
||||
|
||||
# Check to see if the fleetctl binary exists in the script's install directory.
|
||||
check_installed_version() {
|
||||
# If the fleetctl binary exists, we'll check the version of it using fleetctl -v.
|
||||
if [ -x "${FLEETCTL_INSTALL_DIR}/fleetctl" ]; then
|
||||
installed_version=$("${FLEETCTL_INSTALL_DIR}/fleetctl" -v | awk 'NR==1{print $NF}' | sed 's/^v//')
|
||||
echo "Installed version: ${installed_version}"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Create the install directory if it does not exist.
|
||||
mkdir -p ${FLEETCTL_INSTALL_DIR}
|
||||
|
||||
# Construct download URL
|
||||
# ex: https://github.com/fleetdm/fleet/releases/download/fleet-v4.43.3/fleetctl_v4.43.3_macos.zip
|
||||
DOWNLOAD_URL="https://github.com/fleetdm/fleet/releases/download/fleet-v${latest_strippedVersion}/fleetctl_v${latest_strippedVersion}_${OS}.tar.gz"
|
||||
|
||||
|
||||
if check_installed_version; then
|
||||
if version_gt $latest_strippedVersion $installed_version; then
|
||||
# Prompt the user for an upgrade
|
||||
read -p "A newer version of fleetctl ($latest_strippedVersion) is available. Would you like to upgrade? (y/n): " upgrade_choice
|
||||
|
||||
if [[ "$upgrade_choice" =~ ^[Yy](es)?$ ]]; then
|
||||
# Remove the old binary
|
||||
rm -f "${FLEETCTL_INSTALL_DIR}/fleetctl"
|
||||
echo "Removing an older version of fleetctl."
|
||||
|
||||
# Download and install the new version
|
||||
download_and_extract
|
||||
echo "fleetctl installed successfully in ${FLEETCTL_INSTALL_DIR}"
|
||||
echo
|
||||
echo "To start the local demo:"
|
||||
echo
|
||||
echo "1. Start Docker Desktop"
|
||||
echo "2. Run ~/.fleetctl/fleetctl preview"
|
||||
else
|
||||
echo "Upgrade canceled."
|
||||
fi
|
||||
else
|
||||
read -p "You are already using the latest version of fleetctl ($latest_strippedVersion) Would you like to reinstall it? (y/n): " reinstall_choice
|
||||
|
||||
if [[ "$reinstall_choice" =~ ^[Yy](es)?$ ]]; then
|
||||
# Remove the old binary
|
||||
rm -f "${FLEETCTL_INSTALL_DIR}/fleetctl"
|
||||
echo "Removing an older version of fleetctl."
|
||||
|
||||
# Download and install the new version
|
||||
download_and_extract
|
||||
echo "fleetctl reinstalled successfully in ${FLEETCTL_INSTALL_DIR}"
|
||||
echo
|
||||
echo "To start the local demo:"
|
||||
echo
|
||||
echo "1. Start Docker Desktop"
|
||||
echo "2. Run ~/.fleetctl/fleetctl preview"
|
||||
else
|
||||
echo "Install canceled."
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# If there is no existing fleetctl binary, download the latest version and extract it.
|
||||
download_and_extract
|
||||
echo "fleetctl installed successfully in ${FLEETCTL_INSTALL_DIR}"
|
||||
echo
|
||||
echo "To start the local demo:"
|
||||
echo
|
||||
echo "1. Start Docker Desktop"
|
||||
echo "2. Run ~/.fleetctl/fleetctl preview"
|
||||
fi
|
||||
|
||||
# Verify if the binary is executable
|
||||
if [[ ! -x "${FLEETCTL_INSTALL_DIR}/fleetctl" ]]; then
|
||||
echo "Failed to install or upgrade fleetctl. Please check your permissions and try running this script again."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
57
website/assets/resources/install-fleetctl.sh
vendored
Normal file
57
website/assets/resources/install-fleetctl.sh
vendored
Normal file
@ -0,0 +1,57 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
FLEETCTL_INSTALL_DIR="${HOME}/.fleetctl/"
|
||||
|
||||
|
||||
# Check for necessary commands
|
||||
for cmd in curl tar grep sed; do
|
||||
if ! command -v $cmd &> /dev/null; then
|
||||
echo "Error: $cmd is not installed." >&2
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Fetching the latest version of fleetctl..."
|
||||
|
||||
|
||||
# Fetch the latest version number from NPM
|
||||
latest_strippedVersion=$(curl -s "https://registry.npmjs.org/fleetctl/latest" | grep -o '"version": *"[^"]*"' | cut -d'"' -f4)
|
||||
echo "Latest version available on NPM: $latest_strippedVersion"
|
||||
|
||||
version_gt() {
|
||||
test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1";
|
||||
}
|
||||
|
||||
# Determine operating system (Linux or MacOS)
|
||||
OS="$(uname -s)"
|
||||
|
||||
case "${OS}" in
|
||||
Linux*) OS='linux';;
|
||||
Darwin*) OS='macos';;
|
||||
*) echo "Unsupported operating system: ${OS}"; exit 1;;
|
||||
esac
|
||||
|
||||
# Create the install directory if it does not exist.
|
||||
mkdir -p "${FLEETCTL_INSTALL_DIR}"
|
||||
|
||||
# Construct download URL
|
||||
# ex: https://github.com/fleetdm/fleet/releases/download/fleet-v4.43.3/fleetctl_v4.43.3_macos.zip
|
||||
DOWNLOAD_URL="https://github.com/fleetdm/fleet/releases/download/fleet-v${latest_strippedVersion}/fleetctl_v${latest_strippedVersion}_${OS}.tar.gz"
|
||||
|
||||
# Download the latest version of fleetctl and extract it.
|
||||
echo "Downloading fleetctl ${latest_strippedVersion} for ${OS}..."
|
||||
curl -sSL "$DOWNLOAD_URL" | tar -xz -C "$FLEETCTL_INSTALL_DIR" --strip-components=1 fleetctl_v"${latest_strippedVersion}"_${OS}/
|
||||
echo "fleetctl installed successfully in ${FLEETCTL_INSTALL_DIR}"
|
||||
echo
|
||||
echo "To start the local demo:"
|
||||
echo
|
||||
echo "1. Start Docker Desktop"
|
||||
echo "2. Run ~/.fleetctl/fleetctl preview"
|
||||
|
||||
# Verify if the binary is executable
|
||||
if [[ ! -x "${FLEETCTL_INSTALL_DIR}/fleetctl" ]]; then
|
||||
echo "Failed to install or upgrade fleetctl. Please check your permissions and try running this script again."
|
||||
exit 1
|
||||
fi
|
||||
4
website/views/pages/fleetctl-preview.ejs
vendored
4
website/views/pages/fleetctl-preview.ejs
vendored
@ -27,7 +27,7 @@
|
||||
<div purpose="numbered-steps">
|
||||
<div purpose="step">
|
||||
<p>Install the <code>fleetctl</code> command line tool:</p>
|
||||
<div purpose="terminal-commands"> <p>curl -SsLO https://fleetdm.com/resources/install-fleet.sh -o install_fleet.sh && shasum -a 256 install_fleet.sh</p></div>
|
||||
<div purpose="terminal-commands"> <p>curl -sSL https://fleetdm.com/resources/install-fleetctl.sh | bash</p></div>
|
||||
</div>
|
||||
<div purpose="step">
|
||||
<p>Run a local demo of the Fleet server:</p>
|
||||
@ -45,7 +45,7 @@
|
||||
<div purpose="numbered-steps">
|
||||
<div purpose="step">
|
||||
<p>Install the <code>fleetctl</code> command line tool:</p>
|
||||
<div purpose="terminal-commands"> <p>curl -SsLO https://fleetdm.com/resources/install-fleet.sh -o install_fleet.sh && shasum -a 256 install_fleet.sh</p></div>
|
||||
<div purpose="terminal-commands"> <p>curl -sSL https://fleetdm.com/resources/install-fleetctl.sh | bash</p></div>
|
||||
</div>
|
||||
<div purpose="step">
|
||||
<p>Run a local demo of the Fleet server:</p>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user