Skip to content

E
eepm
Commit aba127ba authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

distr_info: fix ROSA support

parent f3d113a3
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
bin/distr_info
View file @ aba127ba
...@@ -97,9 +97,13 @@ case $DISTRIB_ID in ...@@ -97,9 +97,13 @@ case $DISTRIB_ID in
#which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg #which aptitude 2>/dev/null >/dev/null && CMD=aptitude-dpkg
hascommand snappy && CMD=snappy hascommand snappy && CMD=snappy
;; ;;
Mandriva|ROSA) Mandriva)
CMD="urpm-rpm" CMD="urpm-rpm"
;; ;;
ROSA)
CMD="dnf-rpm"
[ "$DISTRIB_ID/$DISTRIB_RELEASE" = "ROSA/2020" ] && CMD="urpm-rpm"
;;
FreeBSD|NetBSD|OpenBSD|Solaris) FreeBSD|NetBSD|OpenBSD|Solaris)
CMD="pkgsrc" CMD="pkgsrc"
which pkg 2>/dev/null >/dev/null && CMD=pkgng which pkg 2>/dev/null >/dev/null && CMD=pkgng
...@@ -112,8 +116,8 @@ case $DISTRIB_ID in ...@@ -112,8 +116,8 @@ case $DISTRIB_ID in
;; ;;
Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|Scientific|GosLinux|Amzn|RedOS) Fedora|CentOS|OracleLinux|RockyLinux|AlmaLinux|RHEL|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"
;; ;;
Slackware) Slackware)
CMD="slackpkg" CMD="slackpkg"
...@@ -228,6 +232,9 @@ normalize_name() ...@@ -228,6 +232,9 @@ normalize_name()
"RedHatEnterpriseLinuxServer") "RedHatEnterpriseLinuxServer")
echo "RHEL" echo "RHEL"
;; ;;
"ROSA Enterprise Linux Desktop"|"ROSA Enterprise Linux Server")
echo "ROSA"
;;
*) *)
#echo "${1// /}" #echo "${1// /}"
echo "$1" | sed -e "s/ //g" echo "$1" | sed -e "s/ //g"
......
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