saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of the 3xxx.0 if condition

Browse source
This commit is contained in:
Max Arnold 2020-08-14 15:27:40 +07:00
parent ec112a6f45
commit 1e5a9abd69
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap-salt.sh
View file

@ -609,11 +609,7 @@ elif [ "$ITYPE" = "stable" ]; then
shift
elif [ "$(echo "$1" | grep -E '^(2[0-9]*\.[0-9]*\.[0-9]*|[3-9][0-9]{3}(\.[0-9]*)?)$')" != "" ]; then
# Handle the 3xxx.0 version as 3xxx archive (pin to minor) and strip the fake ".0" suffix
if [ "$(echo "$1" | grep -E '[3-9][0-9]{3}\.0$')" != "" ]; then
STABLE_REV=$(echo "$1" | sed -e 's/\.0$//')
else
STABLE_REV="$1"
fi
STABLE_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
if [ "$(uname)" != "Darwin" ]; then
STABLE_REV="archive/$STABLE_REV"
fi