From 320b3b787e75a63521c8ed515fd2076fe2c65936 Mon Sep 17 00:00:00 2001 From: David Murphy Date: Fri, 22 Nov 2024 15:02:06 -0700 Subject: [PATCH] Fixed help output and README --- README.rst | 6 ++---- bootstrap-salt.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 3d3bc8fab..929d93315 100644 --- a/README.rst +++ b/README.rst @@ -264,8 +264,7 @@ Using ``wget`` to install your distribution's stable packages: .. code:: console - wget -O bootstrap-salt.sh - https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh + wget -O bootstrap-salt.sh https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.sh sudo sh bootstrap-salt.sh Installing a specific version from git using ``wget``: @@ -359,8 +358,7 @@ Using ``PowerShell`` to install latest stable version: [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12' Invoke-WebRequest -Uri https://github.com/saltstack/salt-bootstrap/releases/latest/download/bootstrap-salt.ps1 -OutFile "$env:TEMP\bootstrap-salt.ps1" - Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser - & "$env:TEMP\bootstrap-salt.ps1" + Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser & "$env:TEMP\bootstrap-salt.ps1" Display information about the install script parameters: diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index da3c2a5e9..5e17fc15b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -26,7 +26,7 @@ #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2024.11.21" +__ScriptVersion="2024.11.22" __ScriptName="bootstrap-salt.sh" __ScriptFullName="$0" @@ -314,6 +314,9 @@ __usage() { Usage : ${__ScriptName} [options] [install-type-args] + + Usage : bootstrap-salt.sh [options] [install-type-args] + Installation types: - stable Install latest stable release. This is the default install type @@ -351,7 +354,6 @@ __usage() { - ${__ScriptName} onedir_rc - ${__ScriptName} onedir_rc 3008 - Options: -a Pip install all Python pkg dependencies for Salt. Requires -V to install all pip pkgs into the virtualenv. @@ -373,7 +375,7 @@ __usage() { -f Force shallow cloning for git installations. This may result in an "n/a" in the version number. -F Allow copied files to overwrite existing (config, init.d, etc) - -g Salt Git repository URL. Default: ${_SALTSTACK_REPO_URL} + -g Salt Git repository URL. Default: https://github.com/saltstack/salt.git -h Display this message -H Use the specified HTTP proxy for all download URLs (including https://). For example: http://myproxy.example.com:3128 @@ -419,7 +421,7 @@ __usage() { "packages.broadcom.com". If -R is passed, -r is also set. Currently only works on CentOS/RHEL and Debian based distributions and macOS. -s Sleep time used when waiting for daemons to start, restart and when - checking for the services running. Default: ${__DEFAULT_SLEEP} + checking for the services running. Default: 3 -S Also install salt-syndic -r Disable all repository configuration performed by this script. This option assumes all necessary repository configuration is already present