Skip to content
Permalink
Browse files

Add -common to regex when searching for rpm distros

  • Loading branch information...
gkrizek committed Jun 14, 2019
1 parent 65930b7 commit 0114ee84afe76633c9cd28958c2d09cceee84f49
Showing with 3 additions and 3 deletions.
  1. +1 −1 rpm/setup_10.x
  2. +1 −1 rpm/setup_11.x
  3. +1 −1 rpm/setup_12.x
@@ -213,7 +213,7 @@ else

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

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

@@ -213,7 +213,7 @@ else

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

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

@@ -213,7 +213,7 @@ else

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

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

1 comment on commit 0114ee8

@Jukoo

This comment has been minimized.

Copy link
Contributor

commented on 0114ee8 Jun 19, 2019

this commit solve the issue #842

Please sign in to comment.
You can’t perform that action at this time.