Commit 2bcc6bf6 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix override VENDOR_ID

parent 9ebb3966
...@@ -44,7 +44,14 @@ tolower() ...@@ -44,7 +44,14 @@ tolower()
echo "$*" | awk '{print tolower($0)}' echo "$*" | awk '{print tolower($0)}'
} }
# Translate DISTRIB_ID to vendor name (like %_vendor does) override_distrib()
{
[ -n "$1" ] || return
VENDOR_ID=''
DISTRIB_ID="$1"
}
# Translate DISTRIB_ID to vendor name (like %_vendor does), uses VENDOR_ID by default
rpmvendor() rpmvendor()
{ {
[ "$DISTRIB_ID" = "ALTLinux" ] && echo "alt" && return [ "$DISTRIB_ID" = "ALTLinux" ] && echo "alt" && return
...@@ -719,14 +726,12 @@ case $1 in ...@@ -719,14 +726,12 @@ case $1 in
exit 0 exit 0
;; ;;
-p) -p)
# override DISTRIB_ID override_distrib "$2"
test -n "$2" && DISTRIB_ID="$2"
pkgtype pkgtype
exit 0 exit 0
;; ;;
-g) -g)
# override DISTRIB_ID override_distrib "$2"
test -n "$2" && DISTRIB_ID="$2"
pkgmanager pkgmanager
exit 0 exit 0
;; ;;
...@@ -734,14 +739,12 @@ case $1 in ...@@ -734,14 +739,12 @@ case $1 in
print_pretty_name print_pretty_name
;; ;;
--distro-arch) --distro-arch)
# override DISTRIB_ID override_distrib "$2"
test -n "$2" && DISTRIB_ID="$2"
get_distro_arch get_distro_arch
exit 0 exit 0
;; ;;
--debian-arch) --debian-arch)
# override DISTRIB_ID override_distrib "$2"
test -n "$2" && DISTRIB_ID="$2"
get_debian_arch get_debian_arch
exit 0 exit 0
;; ;;
...@@ -773,14 +776,12 @@ case $1 in ...@@ -773,14 +776,12 @@ case $1 in
echo $DISTRIB_RELEASE echo $DISTRIB_RELEASE
;; ;;
-s) -s)
# override DISTRIB_ID override_distrib "$2"
test -n "$2" && DISTRIB_ID="$2"
pkgvendor pkgvendor
exit 0 exit 0
;; ;;
-n) -n)
# override DISTRIB_ID override_distrib "$2"
test -n "$2" && DISTRIB_ID="$2"
rpmvendor rpmvendor
exit 0 exit 0
;; ;;
......
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