Commit 8d14fb5c authored by Vitaly Lipatov's avatar Vitaly Lipatov

use PKGFORMAT where possible

parent b020515d
...@@ -59,7 +59,7 @@ __epm_korinf_site_mask() { ...@@ -59,7 +59,7 @@ __epm_korinf_site_mask() {
[ "$($DISTRVENDOR -a)" = "x86_64" ] && archprefix="x86_64/" [ "$($DISTRVENDOR -a)" = "x86_64" ] && archprefix="x86_64/"
URL="http://updates.etersoft.ru/pub/Korinf" URL="http://updates.etersoft.ru/pub/Korinf"
update_url_if_need_mirrored update_url_if_need_mirrored
echo "$URL/$archprefix$($DISTRVENDOR -e)/$MASK*.$($DISTRVENDOR -p)" echo "$URL/$archprefix$($DISTRVENDOR -e)/$MASK*.$PKGFORMAT"
} }
__epm_korinf_list() { __epm_korinf_list() {
......
...@@ -269,7 +269,7 @@ construct_name() ...@@ -269,7 +269,7 @@ construct_name()
local pds local pds
[ -n "$arch" ] || arch="$($DISTRVENDOR --distro-arch)" [ -n "$arch" ] || arch="$($DISTRVENDOR --distro-arch)"
[ -n "$pkgtype" ] || pkgtype="$($DISTRVENDOR -p)" [ -n "$pkgtype" ] || pkgtype="$PKGFORMAT"
[ -n "$ds" ] || ds=$(get_pkg_name_delimiter $pkgtype) [ -n "$ds" ] || ds=$(get_pkg_name_delimiter $pkgtype)
pds="$ds" pds="$ds"
[ "$pds" = "-" ] && pds="." [ "$pds" = "-" ] && pds="."
......
...@@ -675,7 +675,7 @@ assure_distr() ...@@ -675,7 +675,7 @@ assure_distr()
get_pkg_name_delimiter() get_pkg_name_delimiter()
{ {
local pkgtype="$1" local pkgtype="$1"
[ -n "$pkgtype" ] || pkgtype="$($DISTRVENDOR -p)" [ -n "$pkgtype" ] || pkgtype="$PKGFORMAT"
[ "$pkgtype" = "deb" ] && echo "_" && return [ "$pkgtype" = "deb" ] && echo "_" && return
echo "-" echo "-"
......
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