mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #3840: (de)compression from menu broken due to bad quoting

Browse Source 
If the file is not compressed and DECOMP is empty, it should be replaced
by *nothing*, not an empty argument. Broken in the following commit:

  becc0d01d0

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
This commit is contained in:
Yuriy M. Kaminskiy 2017-07-13 20:02:38 +02:00 committed by Yury V. Zaytsev
parent 4a4f601a90
commit e081d55616
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/mc.menu.in
View File

@ -241,7 +241,8 @@ y Gzip or gunzip current file
case %f in case %f in
*.gz|*.[zZ]) DECOMP=-d;; *.gz|*.[zZ]) DECOMP=-d;;
esac esac
gzip "$DECOMP" -v %f # Do *not* add quotes around $DECOMP!
gzip $DECOMP -v %f
+ t t + t t
Y Gzip or gunzip tagged files Y Gzip or gunzip tagged files
@ -250,7 +251,7 @@ Y Gzip or gunzip tagged files
case "$i" in case "$i" in
*.gz|*.[zZ]) DECOMP=-d;; *.gz|*.[zZ]) DECOMP=-d;;
esac esac
gzip "$DECOMP" -v "$i" gzip $DECOMP -v "$i"
done done
+ ! t t + ! t t
@ -259,7 +260,7 @@ b Bzip2 or bunzip2 current file
case %f in case %f in
*.bz2) DECOMP=-d;; *.bz2) DECOMP=-d;;
esac esac
bzip2 "$DECOMP" -v %f bzip2 $DECOMP -v %f
+ t t + t t
B Bzip2 or bunzip2 tagged files B Bzip2 or bunzip2 tagged files
@ -268,7 +269,7 @@ B Bzip2 or bunzip2 tagged files
case "$i" in case "$i" in
*.bz2) DECOMP=-d;; *.bz2) DECOMP=-d;;
esac esac
bzip2 "$DECOMP" -v "$i" bzip2 $DECOMP -v "$i"
done done
+ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t + f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t