From 66ae617b778f0de3a9de9d4f6bdef0ec064ea82c Mon Sep 17 00:00:00 2001
From: "Yury V. Zaytsev" <yury.zaytsev@moneymeets.com>
Date: Sat, 17 Dec 2016 09:17:29 +0100
Subject: [PATCH] extfs: fix whitespace soup in u7z helper

Signed-off-by: Yury V. Zaytsev <yury.zaytsev@moneymeets.com>
---
 src/vfs/extfs/helpers/u7z | 52 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/vfs/extfs/helpers/u7z b/src/vfs/extfs/helpers/u7z
index 63386158f..22e9f279d 100755
--- a/src/vfs/extfs/helpers/u7z
+++ b/src/vfs/extfs/helpers/u7z
@@ -21,12 +21,12 @@ P7ZIP=`which 7z 2>/dev/null` || P7ZIP=`which 7za 2>/dev/null` || P7ZIP=`which 7z
 
 mcu7zip_list ()
 {
-	# Symlinks are not shown - no idea how to distinguish them
-	# Read-only files are not shown as such - it's rarely useful
-	ugid="`id -nu` `id -ng`"
-	date_re='^\(....\)-\(..\)-\(..\) \(..:..:..\)'
-	date_mc='\2-\3-\1 \4'
-	size_re='............'
+        # Symlinks are not shown - no idea how to distinguish them
+        # Read-only files are not shown as such - it's rarely useful
+        ugid="`id -nu` `id -ng`"
+        date_re='^\(....\)-\(..\)-\(..\) \(..:..:..\)'
+        date_mc='\2-\3-\1 \4'
+        size_re='............'
         # archive entries can have no datetime info, 7z will use archive file datetime
         date_archive=`stat -c %y "$1" 2>/dev/null | sed -n "s/${date_re}.*/${date_mc}/p" 2>/dev/null`
         [ "${date_archive}"x = x ] && date_archive=`ls -lan "$1" 2>/dev/null | awk '{print $6,"",$7,"",$8}' 2>/dev/null`
@@ -39,42 +39,42 @@ mcu7zip_list ()
 
 mcu7zip_copyout ()
 {
-	#first we check if we have old p7zip archive with prefix ./ in filename
-	$P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
-	EXFNAME='*./'"$2" || EXFNAME="$2"
-	$P7ZIP e -so "$1" "$EXFNAME" > "$3" 2>/dev/null
+        #first we check if we have old p7zip archive with prefix ./ in filename
+        $P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
+        EXFNAME='*./'"$2" || EXFNAME="$2"
+        $P7ZIP e -so "$1" "$EXFNAME" > "$3" 2>/dev/null
 }
 
 mcu7zip_copyin ()
 {
-	$P7ZIP a -si"$2" "$1" <"$3" >/dev/null 2>&1
+        $P7ZIP a -si"$2" "$1" <"$3" >/dev/null 2>&1
 }
 
 mcu7zip_mkdir ()
 {
-	dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-u7z.XXXXXX"` || exit 1
-	mkdir -p "$dir"/"$2"
-	$P7ZIP a -w"$dir" "$1" "$dir"/"$2" >/dev/null 2>&1
-	rm -rf "$dir"
+        dir=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-u7z.XXXXXX"` || exit 1
+        mkdir -p "$dir"/"$2"
+        $P7ZIP a -w"$dir" "$1" "$dir"/"$2" >/dev/null 2>&1
+        rm -rf "$dir"
 }
 
 mcu7zip_rm ()
 {
-	# NOTE: Version 4.20 fails to delete files in subdirectories
-	#first we check if we have old p7zip archive with prefix ./ in filename
-	$P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
-	EXFNAME='*./'"$2" || EXFNAME="$2"
-	$P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
-	{ printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
+        # NOTE: Version 4.20 fails to delete files in subdirectories
+        #first we check if we have old p7zip archive with prefix ./ in filename
+        $P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
+        EXFNAME='*./'"$2" || EXFNAME="$2"
+        $P7ZIP d "$1" "$EXFNAME" 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
+        { printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
 }
 
 mcu7zip_rmdir ()
 {
-	#first we check if we have old p7zip archive with prefix ./ in filename
-	$P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
-	EXFNAME='*./'"$2" || EXFNAME="$2"
-	$P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
-	{ printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
+        #first we check if we have old p7zip archive with prefix ./ in filename
+        $P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
+        EXFNAME='*./'"$2" || EXFNAME="$2"
+        $P7ZIP d "$1" "$EXFNAME"/ 2>&1 | grep -q E_NOTIMPL > /dev/null 2>&1 && \
+        { printf "Function not implemented...\n7z cannot delete from solid archive." >&2 ; exit 1 ; }
 }
 
 # override any locale for dates