Skip to content

Commit

Permalink
Fix DIST_VERSION CentOS 8
Browse files Browse the repository at this point in the history
  • Loading branch information
@igsu
igsu committed Dec 8, 2020
1 parent d86fe3e commit e14f7c6
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion rpm/setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_0.10
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_0.12
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_10.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_11.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_12.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_13.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_14.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_15.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_4.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_5.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_6.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_7.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_8.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_9.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_current.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_iojs_1.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_iojs_2.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_iojs_3.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_lts.x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down
2 changes: 1 addition & 1 deletion rpm/src/_setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ else

## Using the redhat-release-server-X, centos-release-X, centos-stream-release-X, etc. pattern
## extract the major version number of the distro
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common)?-([0-9]+).*$/\3/')

if ! [[ $DIST_VERSION =~ ^[0-9][0-9]?$ ]]; then

Expand Down

0 comments on commit e14f7c6

Please sign in to comment.