Merge branch '2598_u7z'

* 2598_u7z:
  Ticket #2598: u7z: Improve handling of missing p7zip binaries.
This commit is contained in:
Andrew Borodin 2011-10-03 13:54:39 +04:00
commit 1e9a3f5d2f
1 changed files with 6 additions and 1 deletions

View File

@ -5,7 +5,7 @@
# Some Bugfixes/workarounds by Sergiy Niskorodov <sgh@mail.zp.ua>
# Licensed under GNU GPL version 2 or later version.
P7ZIP=`which 7z 2>/dev/null` || P7ZIP=`which 7za 2>/dev/null` || P7ZIP=`which 7zr 2>/dev/null`
P7ZIP=`which 7z 2>/dev/null` || P7ZIP=`which 7za 2>/dev/null` || P7ZIP=`which 7zr 2>/dev/null` || P7ZIP=""
mcu7zip_list ()
{
@ -64,6 +64,11 @@ export LC_DATE
umask 077
if [ -z "$P7ZIP" ]; then
echo "Error: could not find p7zip (looked for 7z, 7za and 7zr)" >&2
exit 1
fi
cmd="$1"
shift