Skip to content

E
eepm
Commit a45b1bc8 authored by Nurlan's avatar Nurlan Committed by Vitaly Lipatov
Browse files
Options

erc-sh-archive: Use 7za only if there is no 7z (eterbug #18296)

parent 7c39280f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
bin/erc-sh-archive
View file @ a45b1bc8
...@@ -35,7 +35,6 @@ set_backend() ...@@ -35,7 +35,6 @@ set_backend()
if [ -n "$use_7z" ] || ! have_patool ; then if [ -n "$use_7z" ] || ! have_patool ; then
# TODO: try install patool and p7zip # TODO: try install patool and p7zip
is_command 7za && HAVE_7Z='7za'
if ! is_command $HAVE_7Z ; then if ! is_command $HAVE_7Z ; then
# 7-zip # 7-zip
is_command 7zz && HAVE_7Z='7zz' is_command 7zz && HAVE_7Z='7zz'
...@@ -44,6 +43,10 @@ set_backend() ...@@ -44,6 +43,10 @@ set_backend()
# reduced p7-zip # reduced p7-zip
is_command 7zr && HAVE_7Z='7zr' is_command 7zr && HAVE_7Z='7zr'
fi fi
if ! is_command $HAVE_7Z ; then
# 7-zip Standalone/Alternative
is_command 7za && HAVE_7Z='7za'
fi
is_command $HAVE_7Z || fatal "Could not find any patool or 7-zip backend. Please install p7zip package and retry." is_command $HAVE_7Z || fatal "Could not find any patool or 7-zip backend. Please install p7zip package and retry."
fi fi
[ -z "$force" ] || HAVE_7Z="$HAVE_7Z -y" [ -z "$force" ] || HAVE_7Z="$HAVE_7Z -y"
......
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