Commit abdb9cda authored by Vitaly Lipatov's avatar Vitaly Lipatov

replace all 'epm assure' with 'assure_exists'

parent e0c1ee7a
...@@ -150,7 +150,7 @@ __epm_print_url_alt_check() ...@@ -150,7 +150,7 @@ __epm_print_url_alt_check()
local pkg=$1 local pkg=$1
shift shift
local tm=$(mktemp) local tm=$(mktemp)
epm assure curl assure_exists curl
load_helper epm-site load_helper epm-site
quiet=1 quiet=1
local buildtime=$(paoapi packages/$pkg | get_pao_var buildtime) local buildtime=$(paoapi packages/$pkg | get_pao_var buildtime)
......
...@@ -365,7 +365,7 @@ __epm_restore_npm() ...@@ -365,7 +365,7 @@ __epm_restore_npm()
{ {
local req_file="$1" local req_file="$1"
epm assure jq || fatal assure_exists jq || fatal
if [ -n "$dryrun" ] ; then if [ -n "$dryrun" ] ; then
local lt=$(mktemp) local lt=$(mktemp)
...@@ -421,7 +421,7 @@ __epm_restore_perl_shyaml() ...@@ -421,7 +421,7 @@ __epm_restore_perl_shyaml()
{ {
local req_file="$1" local req_file="$1"
epm assure shyaml || fatal assure_exists shyaml || fatal
if [ -n "$dryrun" ] ; then if [ -n "$dryrun" ] ; then
local lt=$(mktemp) local lt=$(mktemp)
......
...@@ -27,8 +27,8 @@ tasknumber() ...@@ -27,8 +27,8 @@ tasknumber()
get_task_arepo_packages() get_task_arepo_packages()
{ {
local res local res
epm assure apt-repo assure_exists apt-repo
epm assure curl assure_exists curl
info "TODO: please, improve apt-repo to support arepo (i586-) packages for apt-repo list task" info "TODO: please, improve apt-repo to support arepo (i586-) packages for apt-repo list task"
showcmd "curl -s -f http://git.altlinux.org/tasks/$tn/plan/arepo-add-x86_64-i586 | cut -f1" showcmd "curl -s -f http://git.altlinux.org/tasks/$tn/plan/arepo-add-x86_64-i586 | cut -f1"
......
...@@ -25,7 +25,7 @@ PAOURL="https://packages.altlinux.org" ...@@ -25,7 +25,7 @@ PAOURL="https://packages.altlinux.org"
paoapi() paoapi()
{ {
# http://petstore.swagger.io/?url=http://packages.altlinux.org/api/docs # http://petstore.swagger.io/?url=http://packages.altlinux.org/api/docs
epm assure curl || return 1 assure_exists curl || return 1
showcmd curl "$PAOURL/api/$1" showcmd curl "$PAOURL/api/$1"
a='' curl -s --header "Accept: application/json" "$PAOURL/api/$1" a='' curl -s --header "Accept: application/json" "$PAOURL/api/$1"
} }
......
...@@ -50,7 +50,7 @@ __serv_enable() ...@@ -50,7 +50,7 @@ __serv_enable()
sudocmd rc-update add $1 default sudocmd rc-update add $1 default
;; ;;
runit) runit)
epm assure $SERVICE assure_exists $SERVICE
[ -r "/etc/sv/$SERVICE" ] || fatal "Can't find /etc/sv/$SERVICE" [ -r "/etc/sv/$SERVICE" ] || fatal "Can't find /etc/sv/$SERVICE"
sudocmd ln -s /etc/sv/$SERVICE /var/service/ sudocmd ln -s /etc/sv/$SERVICE /var/service/
;; ;;
......
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