History

fix -e/-f ordering issue. Fixes #18

Serge Ziryukin committed 11 years ago

Commit ca2c3861 parent 41464231 file · +9 −5Browse files

Unified · Split

split2flac+9−5
@@ -67,7 +67,7 @@ unset PIC INPATH CUE CHARSET · 66 unmodified lines
6767 FORCE=0
6868
6969 # do not forget to update before commit
70−VERSION=117
70+VERSION=118
7171
7272 HELP="\${cG}split2flac version: ${VERSION}
7373 Splits one big \${cU}APE/FLAC/WV/WAV\$cZ\$cG audio image (or a collection) into \${cU}FLAC/M4A/MP3/OGG_VORBIS/WAV\$cZ\$cG tracks with tagging and renaming.
@@ -123,10 +123,14 @@ emsg () { · 49 unmodified lines
123123 $msg "${cR}$1${cZ}"
124124 }
125125
126+SKIP_UPDATE_ENCARGS=0
127+
126128 update_encargs () {
127− e="\${ENCARGS_${FORMAT}}"
128− ENCARGS=`eval echo "$e"`
129− ENCHELP=0
129+ if [ ${SKIP_UPDATE_ENCARGS} -eq 0 ]; then
130+ e="\${ENCARGS_${FORMAT}}"
131+ ENCARGS=`eval echo "$e"`
132+ ENCHELP=0
133+ fi
130134 }
131135
132136 update_colors () {
@@ -154,7 +158,7 @@ while [ "$1" ]; do · 21 unmodified lines
154158 -cuecharset) CHARSET=$2; shift;;
155159 -nask) NASK=1;;
156160 -f) FORMAT=$2; update_encargs; shift;;
157− -e) ENCARGS=$2; shift;;
161+ -e) ENCARGS=$2; SKIP_UPDATE_ENCARGS=1; shift;;
158162 -eh) ENCHELP=1;;
159163 -enca) ENCA_ARGS=$2; shift;;
160164 -c) NOPIC=0; PIC=$2; shift;;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t