Commit bde29d03 authored by Vitaly Lipatov's avatar Vitaly Lipatov

small fixes

parent 5179daba
менеджер пакетов из NetBSD — pkgsrc (команды для поиска нужных пакетов – pkgin update; pkgin avail; pkgin search).
Загрузку конфига Загрузку конфига
Установку пакета по URL Установку пакета по URL
......
...@@ -55,6 +55,7 @@ __emerge_install_ebuild() ...@@ -55,6 +55,7 @@ __emerge_install_ebuild()
# copy tarballs # copy tarballs
local DDIR=/usr/portage/distfiles local DDIR=/usr/portage/distfiles
# FIXME: use independent dir
[ -d /var/calculate/remote/distfiles ] && DDIR=/var/calculate/remote/distfiles [ -d /var/calculate/remote/distfiles ] && DDIR=/var/calculate/remote/distfiles
docmd cp -f $TARBALLS $DDIR/ || return docmd cp -f $TARBALLS $DDIR/ || return
......
...@@ -23,7 +23,7 @@ get_local_alt_contents_index() ...@@ -23,7 +23,7 @@ get_local_alt_contents_index()
{ {
load_helper epm-repolist load_helper epm-repolist
epm_repolist | grep "rpm file:/" | sed -e "s|^rpm file:||g" | while read URL ARCH other ; do epm_repolist | grep "rpm.*file:/" | sed -e "s|^rpm.*file:||g" | while read URL ARCH other ; do
test -d "$URL/$ARCH" || continue # fatal "Local mirror is not accessible via $URL/$ARCH" test -d "$URL/$ARCH" || continue # fatal "Local mirror is not accessible via $URL/$ARCH"
FILE="$URL/$ARCH/base/contents_index" FILE="$URL/$ARCH/base/contents_index"
if [ -r "$FILE" ] ; then if [ -r "$FILE" ] ; then
......
...@@ -288,7 +288,9 @@ __get_package_for_command() ...@@ -288,7 +288,9 @@ __get_package_for_command()
assure_exists() assure_exists()
{ {
load_helper epm-assure load_helper epm-assure
__epm_assure "$1" $(__get_package_for_command "$1") local package="$2"
[ -n "$package" ] || package="$(__get_package_for_command "$1")"
__epm_assure "$1" $package
} }
# improve # improve
......
...@@ -241,6 +241,7 @@ if [ -z "$withoutservicename" ] && [ -z "$service_name" ] ; then ...@@ -241,6 +241,7 @@ if [ -z "$withoutservicename" ] && [ -z "$service_name" ] ; then
fatal "Run $ $progname --help for get help" fatal "Run $ $progname --help for get help"
fi fi
# use common way if the command is unknown
if [ -z "$serv_cmd" ] ; then if [ -z "$serv_cmd" ] ; then
serv_cmd=common serv_cmd=common
fi fi
......
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