mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '44_more_functionally_u7z'

Browse Source 
* 44_more_functionally_u7z:
  Ticket #44: More functionally u7z.
This commit is contained in:
Slava Zanko 2009-09-24 14:15:15 +03:00
commit bc4067888c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vfs/extfs/u7z
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=7za
P7ZIP=`which 7z 2>/dev/null` || P7ZIP=`which 7za 2>/dev/null`
mcu7zip_list ()
{
@ -21,8 +21,8 @@ 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" && \
EXFNAME=*./"$2" || EXFNAME="$2"
$P7ZIP l "$1" "$2" | grep -q "0 files, 0 folders" && \
EXFNAME='*./'"$2" || EXFNAME="$2"
$P7ZIP e -so "$1" "$EXFNAME" > "$3" 2>/dev/null
}
@ -43,8 +43,8 @@ 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" && \
EXFNAME=*./"$2" || EXFNAME="$2"
$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 ; }
}
@ -52,8 +52,8 @@ mcu7zip_rm ()
mcu7zip_rmdir ()
{
#first we check if we have old p7zip archive with prefix ./ in filename
$P7ZIP l "$1" "$2" | grep -q "0 files" && \
EXFNAME=*./"$2" || EXFNAME="$2"
$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 ; }
}