DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes for Red Hat Enterprise Linux 7 and CentOS 6 (#3846)

Browse source 
* Changes for Red Hat Enterprise Linux.

RHEL uses "rhel" in the ID field in /etc/os-release. We'll leave
"redhat" in the script just in case.

Also, RHEL uses a two digit version number in the VERSION_ID field. So
instead of looking for just "7", look for anything that starts with "7".
This should fix RHEL installations as well as not break anything
with CentOS.

* Fixes issue #3079.

"lsb_release -s -r" returns a two digit version number (at least on recent CentOS releases) while the script is looking for a single digit version. We'll change the script so that it only looks for the version starting with 6. This fixes recent releases of CentOS, while also not breaking previous versions that may have used a single digit.
This commit is contained in:
Ryan McGuire 2017-08-18 18:12:09 -04:00 committed by snipe
parent cef67695cd
commit 481143b891
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
snipeit.sh
View file

@ -151,7 +151,7 @@ case $distro in
echo " The installer has detected Debian version $version as the OS." echo " The installer has detected Debian version $version as the OS."
distro=debian distro=debian
;; ;;
*centos*|*redhat*|*ol*) *centos*|*redhat*|*ol*|*rhel*)
echo " The installer has detected $distro version $version as the OS." echo " The installer has detected $distro version $version as the OS."
distro=centos distro=centos
;; ;;
@ -292,7 +292,7 @@ case $distro in
service apache2 restart service apache2 restart
;; ;;
centos ) centos )
if [ "$version" == "6" ]; then if [[ "$version" =~ ^6 ]]; then
##################################### Install for Centos/Redhat 6 ############################################## ##################################### Install for Centos/Redhat 6 ##############################################
webdir=/var/www/html webdir=/var/www/html
@ -409,7 +409,7 @@ case $distro in
service httpd restart service httpd restart
elif [ "$version" == "7" ]; then elif [[ "$version" =~ ^7 ]]; then
##################################### Install for Centos/Redhat 7 ############################################## ##################################### Install for Centos/Redhat 7 ##############################################
webdir=/var/www/html webdir=/var/www/html