Skip to content

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

commit packed 3.64.13

parent 2ff0e735
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
packed/serv.sh
View file @ b07b295a
...@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR ...@@ -34,7 +34,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.64.12" EPMVERSION="3.64.13"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -709,6 +709,12 @@ esu() ...@@ -709,6 +709,12 @@ esu()
fi fi
} }
__convert_glob__to_regexp()
{
# translate glob to regexp
echo "$1" | sed -e "s|\*|.*|g" -e "s|?|.|g"
}
regexp_subst() regexp_subst()
{ {
local expression="$1" local expression="$1"
...@@ -2301,10 +2307,10 @@ esac ...@@ -2301,10 +2307,10 @@ esac
case "$DISTRIB_ID" in case "$DISTRIB_ID" in
"ALTLinux") "ALTLinux")
echo "$VERSION" | grep -q "c9.* branch" && DISTRIB_RELEASE="c9" echo "$VERSION" | grep -q "c9\.* branch" && DISTRIB_RELEASE="c9"
echo "$VERSION" | grep -q "c9f1 branch" && DISTRIB_RELEASE="c9f1" if echo "$VERSION" | grep -q -E "c[0-9]+f[1-9] branch" ; then
echo "$VERSION" | grep -q "c9f2 branch" && DISTRIB_RELEASE="c9f2" DISTRIB_RELEASE="$(echo "$VERSION" | sed 's| branch||')"
echo "$VERSION" | grep -q "c9f3 branch" && DISTRIB_RELEASE="c9f3" fi
DISTRIB_CODENAME="$DISTRIB_RELEASE" DISTRIB_CODENAME="$DISTRIB_RELEASE"
# FIXME: fast hack for fallback: 10.1 -> p10 for /etc/os-release # FIXME: fast hack for fallback: 10.1 -> p10 for /etc/os-release
if echo "$DISTRIB_RELEASE" | grep -q "^0" ; then if echo "$DISTRIB_RELEASE" | grep -q "^0" ; then
......
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