Commit f63ace84 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm-epm_install: fix for install more short name

parent 7df19afe
#!/bin/sh #!/bin/sh
# Copyright (C) 2016 Etersoft # Copyright (C) 2016, 2020 Etersoft
# Copyright (C) 2016 Danil Mikhailov <danil@etersoft.ru> # Copyright (C) 2016 Danil Mikhailov <danil@etersoft.ru>
# Copyright (C) 2016 Vitaly Lipatov <lav@etersoft.ru> # Copyright (C) 2016, 2020 Vitaly Lipatov <lav@etersoft.ru>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by # it under the terms of the GNU Affero General Public License as published by
...@@ -23,6 +23,8 @@ load_helper epm-install ...@@ -23,6 +23,8 @@ load_helper epm-install
__epm_korinf_site_mask() { __epm_korinf_site_mask() {
local MASK="$1" local MASK="$1"
local archprefix="" local archprefix=""
# short hack to install needed package
rhas "$MASK" "[-_]" || MASK="$MASK[-_][0-9]"
# set arch for Korinf compatibility # set arch for Korinf compatibility
[ "$($DISTRVENDOR -a)" = "x86_64" ] && archprefix="x86_64/" [ "$($DISTRVENDOR -a)" = "x86_64" ] && archprefix="x86_64/"
echo "http://updates.etersoft.ru/pub/Korinf/$archprefix$($DISTRVENDOR -e)/$MASK*.$($DISTRVENDOR -p)" echo "http://updates.etersoft.ru/pub/Korinf/$archprefix$($DISTRVENDOR -e)/$MASK*.$($DISTRVENDOR -p)"
...@@ -30,17 +32,18 @@ __epm_korinf_site_mask() { ...@@ -30,17 +32,18 @@ __epm_korinf_site_mask() {
__epm_korinf_list() { __epm_korinf_list() {
local MASK="$1" local MASK="$1"
showcmd eget --list "$(__epm_korinf_site_mask "$MASK")" MASK="$(__epm_korinf_site_mask "$MASK")"
eget --list "$(__epm_korinf_site "$MASK")" | sort showcmd eget --list "$MASK"
eget --list "$MASK" | sort
} }
__epm_korinf_install(){ __epm_korinf_install() {
local PACKAGE="$1" local PACKAGE="$1"
epm install $(__epm_korinf_site_mask "$PACKAGE$(get_pkg_name_delimiter)") epm install $(__epm_korinf_site_mask "$PACKAGE")
} }
epm_epm_install(){ epm_epm_install() {
local i local i
local pkglist="$*" local pkglist="$*"
......
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