Skip to content

Commit

Permalink
Merge pull request #1328 from nodesource/jesuspaz/fedora-support
Browse files Browse the repository at this point in the history 
Update Fedora regex
  • Loading branch information
@JesusPaz
JesusPaz committed Jan 11, 2022
2 parents e37049c + 1869c65 commit 1a2d4df
Show file tree
Hide file tree
Showing 23 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion rpm/setup
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_0.10
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_0.12
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_10.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_11.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_12.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_13.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_14.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_15.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_16.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_17.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_4.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_5.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_6.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_7.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_8.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_9.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_current.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_iojs_1.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_iojs_2.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_iojs_3.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/setup_lts.x
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/src/_setup.sh
View file
Expand Up @@ -235,7 +235,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
if [[ $DIST_TYPE =~ fc ]]; then
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container)?-([0-9]+).*$/\4/')
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/.*fedora([[:alpha:]]+(-stream|-linux)?)?-release(-server|-workstation|-client|-common|-container|-kde|-cloud|-xfce)?-([0-9]+).*$/\4/')
else
DIST_VERSION=$(echo $DISTRO_PKG | sed -r 's/^[[:alpha:]]+(-stream|-linux)?-release(-server|-workstation|-client|-common|-container|-Default)?-([0-9]+).*$/\3/')
fi
Expand Down

0 comments on commit 1a2d4df

Please sign in to comment.