From 4271c184de4f91bcf6d9e564f61fffcaf17d4a6a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Thu, 25 Aug 2011 14:20:36 +0200
Subject: [PATCH] Ticket #2598: u7z: Improve handling of missing p7zip
 binaries.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/vfs/extfs/helpers/u7z | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vfs/extfs/helpers/u7z b/src/vfs/extfs/helpers/u7z
index 9d41ac603..ad21c43a8 100755
--- a/src/vfs/extfs/helpers/u7z
+++ b/src/vfs/extfs/helpers/u7z
@@ -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