Commit a3926d9d authored by Vitaly Lipatov's avatar Vitaly Lipatov

distr_info: use RELS name for ROSA Server

parent 21735ad6
...@@ -108,7 +108,6 @@ case $DISTRIB_ID in ...@@ -108,7 +108,6 @@ case $DISTRIB_ID in
ROSA) ROSA)
CMD="dnf-rpm" CMD="dnf-rpm"
hascommand dnf || CMD="yum-rpm" hascommand dnf || CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/7" ] && CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm" [ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm"
;; ;;
FreeBSD|NetBSD|OpenBSD|Solaris) FreeBSD|NetBSD|OpenBSD|Solaris)
...@@ -121,7 +120,7 @@ case $DISTRIB_ID in ...@@ -121,7 +120,7 @@ case $DISTRIB_ID in
ArchLinux) ArchLinux)
CMD="pacman" CMD="pacman"
;; ;;
Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|Scientific|GosLinux|Amzn|RedOS) Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|RELS|Scientific|GosLinux|Amzn|RedOS)
CMD="dnf-rpm" CMD="dnf-rpm"
hascommand dnf || CMD="yum-rpm" hascommand dnf || CMD="yum-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD="yum-rpm" [ "$DISTRIB_ID/$DISTRIB_RELEASE" = "CentOS/7" ] && CMD="yum-rpm"
...@@ -243,9 +242,12 @@ normalize_name() ...@@ -243,9 +242,12 @@ normalize_name()
"Red Hat Enterprise Linux Server") "Red Hat Enterprise Linux Server")
echo "RHEL" echo "RHEL"
;; ;;
"ROSA Enterprise Linux Desktop"|"ROSA Enterprise Linux Server") "ROSA Enterprise Linux Desktop")
echo "ROSA" echo "ROSA"
;; ;;
"ROSA Enterprise Linux Server")
echo "RELS"
;;
*) *)
#echo "${1// /}" #echo "${1// /}"
firstupper "$1" | sed -e "s/ //g" -e 's|(.*||' firstupper "$1" | sed -e "s/ //g" -e 's|(.*||'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment