Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix installing salt 3007 as stable or onedir #2000

Closed
wants to merge 1 commit into from
Closed

Fix installing salt 3007 as stable or onedir #2000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bootstrap-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ elif [ "$ITYPE" = "stable" ]; then
_ONEDIR_REV="latest"
ITYPE="onedir"
else
if [ "$(echo "$1" | grep -E '^(nightly|latest|3005|3006)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(nightly|latest|3005|3006|3007)$')" != "" ]; then
ONEDIR_REV="$1"
_ONEDIR_REV="$1"
ITYPE="onedir"
Expand All @@ -641,7 +641,7 @@ elif [ "$ITYPE" = "stable" ]; then
ITYPE="onedir"
shift
else
echo "Unknown stable version: $1 (valid: 3005, 3006, latest)"
echo "Unknown stable version: $1 (valid: 3005, 3006, 3007, latest)"
exit 1
fi
fi
Expand Down Expand Up @@ -673,7 +673,7 @@ elif [ "$ITYPE" = "onedir" ]; then
if [ "$#" -eq 0 ];then
ONEDIR_REV="latest"
else
if [ "$(echo "$1" | grep -E '^(nightly|latest|3005|3006)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(nightly|latest|3005|3006|3007)$')" != "" ]; then
ONEDIR_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^(3005(\.[0-9]*)?)')" != "" ]; then
Expand All @@ -685,7 +685,7 @@ elif [ "$ITYPE" = "onedir" ]; then
ONEDIR_REV="minor/$1"
shift
else
echo "Unknown onedir version: $1 (valid: 3005, 3006, latest, nightly.)"
echo "Unknown onedir version: $1 (valid: 3005, 3006, 3007, latest, nightly.)"
exit 1
fi
fi
Expand Down
Loading