Commit 1b5d5373 authored by Vitaly Lipatov's avatar Vitaly Lipatov

commit packed 3.64.62

parent d4c64c6c
Pipeline #17488 passed with stage
in 20 seconds
...@@ -40,7 +40,7 @@ SHAREDIR="$PROGDIR" ...@@ -40,7 +40,7 @@ SHAREDIR="$PROGDIR"
# will replaced with /etc/eepm during install # will replaced with /etc/eepm during install
CONFIGDIR="$PROGDIR/../etc" CONFIGDIR="$PROGDIR/../etc"
export EPMVERSION="3.64.61" export EPMVERSION="3.64.62"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -1015,7 +1015,8 @@ __epm_assure_7zip() ...@@ -1015,7 +1015,8 @@ __epm_assure_7zip()
if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then
: :
else else
epm install 7-zip || epm install p7zip # most distros provide 7zip package, including alt p11 and newer, but p10 and older not.
epm install 7zip || epm install 7-zip || epm install p7zip
fi fi
} }
...@@ -24138,8 +24139,8 @@ url_get_filename() ...@@ -24138,8 +24139,8 @@ url_get_filename()
loc="$(echo "$loc" | sed -e "s|\?.*||")" loc="$(echo "$loc" | sed -e "s|\?.*||")"
fi fi
# hack for redirect to the main page # hack for redirect to the main page (root URL with no filename)
if is_httpurl "$loc" ; then if echo "$loc" | grep -qE '^https?://[^/]+/?$' ; then
loc="" loc=""
fi fi
......
...@@ -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.61" EPMVERSION="3.64.62"
# package, single (file), pipe, git # package, single (file), pipe, git
EPMMODE="package" EPMMODE="package"
...@@ -1006,7 +1006,8 @@ __epm_assure_7zip() ...@@ -1006,7 +1006,8 @@ __epm_assure_7zip()
if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then if is_command 7z || is_command 7za || is_command 7zr || is_command 7zz ; then
: :
else else
epm install 7-zip || epm install p7zip # most distros provide 7zip package, including alt p11 and newer, but p10 and older not.
epm install 7zip || epm install 7-zip || epm install p7zip
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