Skip to content

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

commit packed 3.60.7

parent fdddce4b
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 90 deletions
packed/epm.sh
View file @ 451a81ce
...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR ...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.60.6" EPMVERSION="3.60.7"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -10037,7 +10037,8 @@ __try_fix_apt_source_list() ...@@ -10037,7 +10037,8 @@ __try_fix_apt_source_list()
local list="$1" local list="$1"
local br="$(__repofix_filter_vendor "$2")" local br="$(__repofix_filter_vendor "$2")"
local path="$3" local path="$3"
if grep -q -e "^[^#].*$path" $list ; then # FIXME: masked grep: предупреждение: stray \ before /
if grep -q -e "^[^#].*$path" $list 2>/dev/null ; then
if __repofix_check_vendor $br ; then if __repofix_check_vendor $br ; then
regexp_subst "/$path/s/^rpm[[:space:]]*([fhr])/rpm [$br] \1/" $list regexp_subst "/$path/s/^rpm[[:space:]]*([fhr])/rpm [$br] \1/" $list
else else
...@@ -10076,29 +10077,12 @@ __fix_alt_sources_list() ...@@ -10076,29 +10077,12 @@ __fix_alt_sources_list()
done done
} }
__subst_with_etersoft_url()
{
local NURL="http://download.etersoft.ru/pub ALTLinux"
echo "$1" | sed \
-e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
-e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|"
}
__subst_with_eterfund_url()
{
local NURL="https://mirror.eterfund.org/download.etersoft.ru/pub ALTLinux"
echo "$1" | sed \
-e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|"
}
__subst_with_yandex_url() __subst_with_repo_url()
{ {
local NURL="http://mirror.yandex.ru altlinux" local NURL="$2"
echo "$1" | sed \ echo "$1" | sed \
-e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \ -e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \ -e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \ -e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \
...@@ -10106,56 +10090,15 @@ __subst_with_yandex_url() ...@@ -10106,56 +10090,15 @@ __subst_with_yandex_url()
-e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|" -e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|"
} }
__subst_with_basealt_url() __change_repo()
{
local NURL="http://ftp.basealt.ru/pub/distributions ALTLinux"
echo "$1" | sed \
-e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|"
}
__subst_with_altlinux_url()
{
local NURL="http://ftp.altlinux.org/pub/distributions ALTLinux"
echo "$1" | sed \
-e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
-e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|" \
-e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|"
}
__fix_repo_to_etersoft()
{ {
local SHORT="$1"
local REPLTO="$2"
local NN local NN
a="" apt-repo list | grep -v debuginfo | grep -v etersoft | grep -v "file:/" | while read nn ; do a="" apt-repo list | grep -v $SHORT | grep -v "file:/" | while read nn ; do
NN="$(__subst_with_etersoft_url "$nn")" NN="$(__subst_with_repo_url "$nn" "$REPLTO")"
[ "$NN" = "$nn" ] && continue [ "$NN" = "$nn" ] && continue
epm removerepo "$nn" epm addrepo "$NN" && epm removerepo "$nn" || return 1
epm addrepo "$NN"
done
}
__fix_repo_to_yandex()
{
local NN
a="" apt-repo list | grep -v debuginfo | grep -v mirror\.yandex | grep -v "file:/" | while read nn ; do
NN="$(__subst_with_yandex_url "$nn")"
[ "$NN" = "$nn" ] && continue
epm removerepo "$nn"
epm addrepo "$NN"
done
}
__fix_repo_to_basealt()
{
local NN
a="" apt-repo list | grep -v debuginfo | grep -v ftp.basealt | grep -v "file:/" | while read nn ; do
NN="$(__subst_with_basealt_url "$nn")"
[ "$NN" = "$nn" ] && continue
epm removerepo "$nn"
epm addrepo "$NN"
done done
} }
...@@ -10171,26 +10114,25 @@ case $BASEDISTRNAME in ...@@ -10171,26 +10114,25 @@ case $BASEDISTRNAME in
__fix_alt_sources_list /etc/apt/sources.list __fix_alt_sources_list /etc/apt/sources.list
__fix_alt_sources_list /etc/apt/sources.list.d/*.list __fix_alt_sources_list /etc/apt/sources.list.d/*.list
# TODO: move to repo change # TODO: move to repo change
if [ "$1" = "etersoft" ] ; then case "$1" in
__fix_repo_to_etersoft /etc/apt/sources.list "etersoft")
__fix_repo_to_etersoft /etc/apt/sources.list.d/*.list __change_repo etersoft "http://download.etersoft.ru/pub ALTLinux"
fi ;;
if [ "$1" = "eterfund.org" ] ; then "eterfund.org")
__fix_repo_to_eterfund /etc/apt/sources.list __change_repo eterfund.org "https://mirror.eterfund.org/download.etersoft.ru/pub ALTLinux"
__fix_repo_to_eterfund /etc/apt/sources.list.d/*.list ;;
fi "yandex")
if [ "$1" = "yandex" ] ; then __change_repo mirror.yandex "http://mirror.yandex.ru altlinux"
__fix_repo_to_yandex /etc/apt/sources.list ;;
__fix_repo_to_yandex /etc/apt/sources.list.d/*.list "basealt")
fi __change_repo ftp.basealt "http://ftp.basealt.ru/pub/distributions ALTLinux"
if [ "$1" = "basealt" ] ; then ;;
__fix_repo_to_basealt /etc/apt/sources.list "altlinux.org")
__fix_repo_to_basealt /etc/apt/sources.list.d/*.list __change_repo ftp.altlinux "http://ftp.altlinux.org/pub/distributions ALTLinux"
fi ;;
if [ "$1" = "altlinux.org" ] ; then *)
__fix_repo_to_altlinux /etc/apt/sources.list fatal "Unsupported change key $1"
__fix_repo_to_altlinux /etc/apt/sources.list.d/*.list esac
fi
docmd apt-repo list docmd apt-repo list
return return
;; ;;
...@@ -12866,6 +12808,9 @@ __save_available_packages() ...@@ -12866,6 +12808,9 @@ __save_available_packages()
# update list only if the system supports bash completion # update list only if the system supports bash completion
[ -d /etc/bash_completion.d ] || return 0 [ -d /etc/bash_completion.d ] || return 0
# HACK: too much time (5 minutes) on deb systems in a docker
[ $PMTYPE = "apt-dpkg" ] && return 0
info "Retrieving list of all available packages (for autocompletion) ..." info "Retrieving list of all available packages (for autocompletion) ..."
short=--short epm_list_available | sort | sudorun tee $epm_vardir/available-packages >/dev/null short=--short epm_list_available | sort | sudorun tee $epm_vardir/available-packages >/dev/null
} }
......
packed/serv.sh
View file @ 451a81ce
...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR ...@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR=$PROGDIR/../etc CONFIGDIR=$PROGDIR/../etc
EPMVERSION="3.60.6" EPMVERSION="3.60.7"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
......
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