From 46464fbdfacfc9e824aac15c404f7ca3ec6e2c0d Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Fri, 12 Aug 2022 04:13:00 +0300
Subject: [PATCH] commit packed 3.23.1
---
packed/epm.sh | 17 ++++++++++++-----
packed/serv.sh | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/packed/epm.sh b/packed/epm.sh
index 37e96790..0d1c3fbd 100755
--- a/packed/epm.sh
+++ b/packed/epm.sh
@@ -4990,20 +4990,27 @@ __do_query_real_file()
fi
fi
+ [ -n "$TOFILE" ] || return
+
+ local RES
if [ -n "$short" ] ; then
- __do_short_query "$TOFILE" || return
+ __do_short_query "$TOFILE"
+ RES=$?
else
- __do_query "$TOFILE" || return
+ __do_query "$TOFILE"
+ RES=$?
fi
# get value of symbolic link
- if [ -n "$TOFILE" ] && [ -L "$TOFILE" ] ; then
+ if [ -L "$TOFILE" ] ; then
local LINKTO
LINKTO=$(readlink -- "$TOFILE")
info " > $TOFILE is link to $LINKTO"
LINKTO=$(readlink -f -- "$TOFILE")
__do_query_real_file "$LINKTO"
return
+ else
+ return $RES
fi
}
@@ -11125,7 +11132,7 @@ Examples:
print_version()
{
- echo "EPM package manager version 3.23.0 https://wiki.etersoft.ru/Epm"
+ echo "EPM package manager version 3.23.1 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
@@ -11135,7 +11142,7 @@ print_version()
Usage="Usage: epm [options] <command> [package name(s), package files]..."
Descr="epm - EPM package manager"
-EPMVERSION=3.23.0
+EPMVERSION=3.23.1
verbose=$EPM_VERBOSE
quiet=
nodeps=
diff --git a/packed/serv.sh b/packed/serv.sh
index 8710065f..89f89bfd 100755
--- a/packed/serv.sh
+++ b/packed/serv.sh
@@ -2278,7 +2278,7 @@ print_version()
local on_text="(host system)"
local virt="$($DISTRVENDOR -i)"
[ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
- echo "Service manager version 3.23.0 https://wiki.etersoft.ru/Epm"
+ echo "Service manager version 3.23.1 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
--
2.24.1