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

onedir install - correct version regex #1868

Merged
merged 14 commits into from
Sep 16, 2022
Merged

onedir install - correct version regex #1868

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d9c049
strip .0
jeff350 Sep 13, 2022
f9b6cf3
fix regex
jeff350 Sep 13, 2022
04257ca
fix regex
jeff350 Sep 13, 2022
9629b26
support format MAJOR-MINOR
jeff350 Sep 14, 2022
2ff7097
correct regex as requested
jeff350 Sep 15, 2022
ceb0dd7
Merge branch 'develop' into fix_onedir_regex
jeff350 Sep 15, 2022
0ece40c
Update the bootstrap script to work with final onedir releases.
garethgreenaway Sep 1, 2022
f953034
strip .0
jeff350 Sep 13, 2022
6e1d3a8
fix regex
jeff350 Sep 13, 2022
b8be814
fix regex
jeff350 Sep 13, 2022
8e5464b
support format MAJOR-MINOR
jeff350 Sep 14, 2022
f741160
correct regex as requested
jeff350 Sep 15, 2022
b7bd0f4
Install Oracle's EPEL repo on Oracle Linux 7 and 8.
pjcreath Jun 17, 2022
757ec21
Merge branch 'fix_onedir_regex' of github.com:jeff350/salt-bootstrap …
jeff350 Sep 15, 2022
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 @@ -636,13 +636,13 @@ elif [ "$ITYPE" = "onedir" ]; then
if [ "$#" -eq 0 ];then
ONEDIR_REV="latest"
else
if [ "$(echo "$1" | grep -E '^(latest)$')" != "" ]; then
if [ "$(echo "$1" | grep -E '^(latest|3005)$')" != "" ]; then
ONEDIR_REV="$1"
shift
elif [ "$(echo "$1" | grep -E '^([3-9][0-9]{3}?-[0-9]$)')" != "" ]; then
elif [ "$(echo "$1" | grep -E '^([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
#ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
ONEDIR_REV="minor/$1"
ONEDIR_REV=$(echo "$1" | sed -E 's/^([3-9][0-9]{3})\.0$/\1/')
ONEDIR_REV="minor/$ONEDIR_REV"
shift
else
echo "Unknown stable version: $1 (valid: 3005, latest.)"
Expand Down