Commit 6d85ccc0 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.31.1

parent 9692a8c7
...@@ -31,7 +31,7 @@ SHAREDIR=$PROGDIR ...@@ -31,7 +31,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.31.0" EPMVERSION="3.31.1"
load_helper() load_helper()
{ {
...@@ -11384,8 +11384,10 @@ if echo "$1" | grep -q "^https://github.com/" && \ ...@@ -11384,8 +11384,10 @@ if echo "$1" | grep -q "^https://github.com/" && \
return return
fi fi
ERROR=0
for fn in $(get_github_urls "$1" | filter_glob "$MASK" | filter_order) ; do for fn in $(get_github_urls "$1" | filter_glob "$MASK" | filter_order) ; do
sget "$fn" || ERROR=1 sget "$fn" "$TARGETFILE" || ERROR=1
[ -n "$TARGETFILE" ] && [ "$ERROR" = "0" ] && break
done done
return return
fi fi
...@@ -11470,7 +11472,8 @@ fi ...@@ -11470,7 +11472,8 @@ fi
ERROR=0 ERROR=0
for fn in $(get_urls | filter_glob "$MASK" | filter_order) ; do for fn in $(get_urls | filter_glob "$MASK" | filter_order) ; do
is_url "$fn" || fn="$(make_fileurl "$URL" "$(basename "$fn")" )" #" is_url "$fn" || fn="$(make_fileurl "$URL" "$(basename "$fn")" )" #"
sget "$fn" || ERROR=1 sget "$fn" "$TARGETFILE" || ERROR=1
[ -n "$TARGETFILE" ] && [ "$ERROR" = "0" ] && break
done done
return $ERROR return $ERROR
......
...@@ -2375,7 +2375,7 @@ print_version() ...@@ -2375,7 +2375,7 @@ print_version()
local on_text="(host system)" local on_text="(host system)"
local virt="$($DISTRVENDOR -i)" local virt="$($DISTRVENDOR -i)"
[ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)" [ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
echo "Service manager version 3.31.0 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.31.1 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE" echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
......
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