Skip to content

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

commit packed 3.60.4

parent da0d07b4
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 17 deletions
packed/epm.sh
View file @ 792363ad
...@@ -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.3" EPMVERSION="3.60.4"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -342,11 +342,13 @@ sudoepm() ...@@ -342,11 +342,13 @@ sudoepm()
fatal() fatal()
{ {
local PROMOMESSAGE="$EPMPROMOMESSAGE"
[ -n "$PROMOMESSAGE" ] || PROMOMESSAGE=" (you can discuss the epm $EPMVERSION problem in Telegram: https://t.me/useepm)"
if [ -z "$TEXTDOMAIN" ] ; then if [ -z "$TEXTDOMAIN" ] ; then
set_color $RED >&2 set_color $RED >&2
echo -n "ERROR: " >&2 echo -n "ERROR: " >&2
restore_color >&2 restore_color >&2
echo "$* (you can discuss the epm $EPMVERSION problem in Telegram: https://t.me/useepm)" >&2 echo "$* $PROMOMESSAGE" >&2
fi fi
exit 1 exit 1
} }
...@@ -557,8 +559,8 @@ check_sudo_access() ...@@ -557,8 +559,8 @@ check_sudo_access()
for i in /bin/sudo /usr/bin/sudo ; do for i in /bin/sudo /usr/bin/sudo ; do
[ -f $i ] && cmd="$i" [ -f $i ] && cmd="$i"
done done
[ ! -f $cmd ] && warning "sudo command is missed. Try install sudo package (http://altlinux.org/sudo)." && return 1 [ ! -f "$cmd" ] && warning "sudo command is missed. Try install sudo package (http://altlinux.org/sudo)." && return 1
local group="$(stat -c '%G' $cmd)" || fatal local group="$(stat -c '%G' "$cmd")" || fatal
warning "Check if you are in $group group to have access to sudo command." warning "Check if you are in $group group to have access to sudo command."
return 1 return 1
} }
...@@ -571,8 +573,8 @@ check_sudo_access_only() ...@@ -571,8 +573,8 @@ check_sudo_access_only()
for i in /bin/sudo /usr/bin/sudo ; do for i in /bin/sudo /usr/bin/sudo ; do
[ -f $i ] && cmd="$i" [ -f $i ] && cmd="$i"
done done
[ ! -f $cmd ] && return 1 [ ! -f "$cmd" ] && return 1
local group="$(stat -c '%G' $cmd)" || fatal local group="$(stat -c '%G' "$cmd")" || fatal
warning "sudo command is presence, but is not accessible for you. Check if you are in $group group to have access to sudo command." warning "sudo command is presence, but is not accessible for you. Check if you are in $group group to have access to sudo command."
return 1 return 1
} }
...@@ -686,7 +688,7 @@ __epm_assure_7zip() ...@@ -686,7 +688,7 @@ __epm_assure_7zip()
if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then
: :
else else
epm install p7zip epm install 7-zip || epm install p7zip
fi fi
} }
...@@ -844,8 +846,19 @@ assure_tmpdir() ...@@ -844,8 +846,19 @@ assure_tmpdir()
fi fi
} }
test_shell()
{
local R
R="$($CMDSHELL /dev/null 2>&1)"
[ -n "$R" ] && fatal "$CMDSHELL is broken (bash wrongly printing out '$R'). Check ~/.bashrc and /etc/bashrc, run $CMDSHELL manually for test."
}
set_distro_info() set_distro_info()
{ {
test_shell
assure_tmpdir assure_tmpdir
set_bigtmpdir set_bigtmpdir
...@@ -1167,6 +1180,8 @@ epm repo add - add branch repo. Use follow params: ...@@ -1167,6 +1180,8 @@ epm repo add - add branch repo. Use follow params:
autoimports - for BaseALT autoimports repo" autoimports - for BaseALT autoimports repo"
autoports - for Autoports repo (with packages from Sisyphus rebuilt to the branch) autoports - for Autoports repo (with packages from Sisyphus rebuilt to the branch)
altlinuxclub - for altlinuxclub repo (http://altlinuxclub.ru/)" altlinuxclub - for altlinuxclub repo (http://altlinuxclub.ru/)"
deferred - for Etersoft Sisyphus Deferred repo"
deferred.org - for Etersoft Sisyphus Deferred repo (at mirror.eterfund.org)"
etersoft - for LINUX@Etersoft repo" etersoft - for LINUX@Etersoft repo"
korinf - for Korinf repo" korinf - for Korinf repo"
<task number> - add task repo" <task number> - add task repo"
...@@ -1260,6 +1275,16 @@ __epm_addrepo_altlinux() ...@@ -1260,6 +1275,16 @@ __epm_addrepo_altlinux()
epm repo add "rpm $http://download.etersoft.ru/pub Korinf/ALTLinux/$DISTRVERSION main" epm repo add "rpm $http://download.etersoft.ru/pub Korinf/ALTLinux/$DISTRVERSION main"
return 0 return 0
;; ;;
deferred)
[ "$DISTRVERSION" = "Sisyphus" ] || fatal "Etersot Sisyphus Deferred supported only for ALT Sisyphus."
epm repo add "http://download.etersoft.ru/pub Etersoft/Sisyphus/Deferred"
return 0
;;
deferred.org)
[ "$DISTRVERSION" = "Sisyphus" ] || fatal "Etersot Sisyphus Deferred supported only for ALT Sisyphus."
epm repo add "http://mirror.eterfund.org/download.etersoft.ru/pub Etersoft/Sisyphus/Deferred"
return 0
;;
archive) archive)
datestr="$2" datestr="$2"
echo "$datestr" | grep -Eq "^20[0-2][0-9]/[01][0-9]/[0-3][0-9]$" || fatal "use follow date format: 2017/01/31" echo "$datestr" | grep -Eq "^20[0-2][0-9]/[01][0-9]/[0-3][0-9]$" || fatal "use follow date format: 2017/01/31"
...@@ -4221,7 +4246,7 @@ __epm_check_if_src_rpm() ...@@ -4221,7 +4246,7 @@ __epm_check_if_src_rpm()
{ {
local pkg local pkg
for pkg in $@ ; do for pkg in $@ ; do
echo "$pkg" | grep -q "\.src.\rpm" && fatal "Installation of a source packages (like '$pkg') is not supported." echo "$pkg" | grep -q "\.src\.rpm" && fatal "Installation of a source packages (like '$pkg') is not supported."
done done
} }
...@@ -9542,7 +9567,7 @@ epm_repo() ...@@ -9542,7 +9567,7 @@ epm_repo()
""|list) # HELPCMD: list enabled repositories (-a|--all for list disabled repositorires too) ""|list) # HELPCMD: list enabled repositories (-a|--all for list disabled repositorires too)
epm_repolist "$@" epm_repolist "$@"
;; ;;
change) # HELPCMD: <mirror>: switch sources to the mirror (supports etersoft/yandex/basealt): rewrite URLs to the specified server change) # HELPCMD: <mirror>: switch sources to the mirror (supports etersoft/yandex/basealt/altlinux.org/eterfund.org): rewrite URLs to the specified server
epm_repofix "$@" epm_repofix "$@"
;; ;;
set) # HELPCMD: <mirror>: remove all existing sources and add mirror for the branch set) # HELPCMD: <mirror>: remove all existing sources and add mirror for the branch
...@@ -10054,6 +10079,16 @@ __subst_with_etersoft_url() ...@@ -10054,6 +10079,16 @@ __subst_with_etersoft_url()
echo "$1" | sed \ echo "$1" | sed \
-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://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|" -e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|"
} }
...@@ -10064,7 +10099,8 @@ __subst_with_yandex_url() ...@@ -10064,7 +10099,8 @@ __subst_with_yandex_url()
-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|" \
-e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|" -e "s|h\?f\?t\?tp://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() __subst_with_basealt_url()
...@@ -10073,6 +10109,17 @@ __subst_with_basealt_url() ...@@ -10073,6 +10109,17 @@ __subst_with_basealt_url()
echo "$1" | sed \ echo "$1" | sed \
-e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \ -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://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|" -e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|"
} }
...@@ -10125,6 +10172,10 @@ case $BASEDISTRNAME in ...@@ -10125,6 +10172,10 @@ case $BASEDISTRNAME in
__fix_repo_to_etersoft /etc/apt/sources.list __fix_repo_to_etersoft /etc/apt/sources.list
__fix_repo_to_etersoft /etc/apt/sources.list.d/*.list __fix_repo_to_etersoft /etc/apt/sources.list.d/*.list
fi fi
if [ "$1" = "eterfund.org" ] ; then
__fix_repo_to_eterfund /etc/apt/sources.list
__fix_repo_to_eterfund /etc/apt/sources.list.d/*.list
fi
if [ "$1" = "yandex" ] ; then if [ "$1" = "yandex" ] ; then
__fix_repo_to_yandex /etc/apt/sources.list __fix_repo_to_yandex /etc/apt/sources.list
__fix_repo_to_yandex /etc/apt/sources.list.d/*.list __fix_repo_to_yandex /etc/apt/sources.list.d/*.list
...@@ -10133,6 +10184,10 @@ case $BASEDISTRNAME in ...@@ -10133,6 +10184,10 @@ case $BASEDISTRNAME in
__fix_repo_to_basealt /etc/apt/sources.list __fix_repo_to_basealt /etc/apt/sources.list
__fix_repo_to_basealt /etc/apt/sources.list.d/*.list __fix_repo_to_basealt /etc/apt/sources.list.d/*.list
fi fi
if [ "$1" = "altlinux.org" ] ; then
__fix_repo_to_altlinux /etc/apt/sources.list
__fix_repo_to_altlinux /etc/apt/sources.list.d/*.list
fi
docmd apt-repo list docmd apt-repo list
return return
;; ;;
...@@ -12804,6 +12859,9 @@ __save_available_packages() ...@@ -12804,6 +12859,9 @@ __save_available_packages()
{ {
[ -d "$epm_vardir" ] || return 0 [ -d "$epm_vardir" ] || return 0
# update list only if the system supports bash completion
[ -d /etc/bash_completion.d ] || 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 @ 792363ad
...@@ -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.3" EPMVERSION="3.60.4"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -343,11 +343,13 @@ sudoepm() ...@@ -343,11 +343,13 @@ sudoepm()
fatal() fatal()
{ {
local PROMOMESSAGE="$EPMPROMOMESSAGE"
[ -n "$PROMOMESSAGE" ] || PROMOMESSAGE=" (you can discuss the epm $EPMVERSION problem in Telegram: https://t.me/useepm)"
if [ -z "$TEXTDOMAIN" ] ; then if [ -z "$TEXTDOMAIN" ] ; then
set_color $RED >&2 set_color $RED >&2
echo -n "ERROR: " >&2 echo -n "ERROR: " >&2
restore_color >&2 restore_color >&2
echo "$* (you can discuss the epm $EPMVERSION problem in Telegram: https://t.me/useepm)" >&2 echo "$* $PROMOMESSAGE" >&2
fi fi
exit 1 exit 1
} }
...@@ -558,8 +560,8 @@ check_sudo_access() ...@@ -558,8 +560,8 @@ check_sudo_access()
for i in /bin/sudo /usr/bin/sudo ; do for i in /bin/sudo /usr/bin/sudo ; do
[ -f $i ] && cmd="$i" [ -f $i ] && cmd="$i"
done done
[ ! -f $cmd ] && warning "sudo command is missed. Try install sudo package (http://altlinux.org/sudo)." && return 1 [ ! -f "$cmd" ] && warning "sudo command is missed. Try install sudo package (http://altlinux.org/sudo)." && return 1
local group="$(stat -c '%G' $cmd)" || fatal local group="$(stat -c '%G' "$cmd")" || fatal
warning "Check if you are in $group group to have access to sudo command." warning "Check if you are in $group group to have access to sudo command."
return 1 return 1
} }
...@@ -572,8 +574,8 @@ check_sudo_access_only() ...@@ -572,8 +574,8 @@ check_sudo_access_only()
for i in /bin/sudo /usr/bin/sudo ; do for i in /bin/sudo /usr/bin/sudo ; do
[ -f $i ] && cmd="$i" [ -f $i ] && cmd="$i"
done done
[ ! -f $cmd ] && return 1 [ ! -f "$cmd" ] && return 1
local group="$(stat -c '%G' $cmd)" || fatal local group="$(stat -c '%G' "$cmd")" || fatal
warning "sudo command is presence, but is not accessible for you. Check if you are in $group group to have access to sudo command." warning "sudo command is presence, but is not accessible for you. Check if you are in $group group to have access to sudo command."
return 1 return 1
} }
...@@ -687,7 +689,7 @@ __epm_assure_7zip() ...@@ -687,7 +689,7 @@ __epm_assure_7zip()
if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then
: :
else else
epm install p7zip epm install 7-zip || epm install p7zip
fi fi
} }
...@@ -845,8 +847,19 @@ assure_tmpdir() ...@@ -845,8 +847,19 @@ assure_tmpdir()
fi fi
} }
test_shell()
{
local R
R="$($CMDSHELL /dev/null 2>&1)"
[ -n "$R" ] && fatal "$CMDSHELL is broken (bash wrongly printing out '$R'). Check ~/.bashrc and /etc/bashrc, run $CMDSHELL manually for test."
}
set_distro_info() set_distro_info()
{ {
test_shell
assure_tmpdir assure_tmpdir
set_bigtmpdir set_bigtmpdir
......
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