Skip to content

Commit

Permalink
add support for Oracle Linux
Browse files Browse the repository at this point in the history 
Fixes: nodesource#331
  • Loading branch information
@rvagg
rvagg committed Jul 7, 2016
1 parent 9095fe0 commit 3c05ae6
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion rpm/setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
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 @@ -247,7 +247,7 @@ fi

if [[ $DISTRO_PKG =~ ^(redhat|centos|cloudlinux|sl)- ]]; then
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^system-release- ]]; then # Amazon Linux
elif [[ $DISTRO_PKG =~ ^(enterprise|system)-release- ]]; then # Oracle Linux & Amazon Linux
DIST_TYPE=el
elif [[ $DISTRO_PKG =~ ^(fedora|korora)- ]]; then
DIST_TYPE=fc
Expand Down
4 changes: 3 additions & 1 deletion rpm/test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ testCheckDistro () {
echo "echo ${uname}" > _test_bin/uname
chmod 755 _test_bin/uname

_result=$(PATH=_test_bin/:${PATH} ./_test_check_distro.sh | sed '/^\+.*$/d')
_result=$(PATH=_test_bin/:${PATH} NODEREPO=pub_0.10 ./_test_check_distro.sh | sed '/^\+.*$/d')
local result=$_result

if [[ $? -ne 0 ]]; then
Expand Down Expand Up @@ -80,6 +80,8 @@ testCheckDistro redhat-release-client-7.2-7.el7.x86_64 x86_64 el

testCheckDistro sl-release-7.1-3.sl7.x86_64 x86_64 el 7 x86_64 https://rpm.nodesource.com/pub_0.10/el/7/x86_64/nodesource-release-el7-1.noarch.rpm

testCheckDistro enterprise-release-5-0.0.22 x86_64 el 5 x86_64 https://rpm.nodesource.com/pub_0.10/el/5/x86_64/nodesource-release-el5-1.noarch.rpm

clean

exit 0

0 comments on commit 3c05ae6

Please sign in to comment.