diff --git a/split2flac b/split2flac index 2cbb71a..fb731de 100755 --- a/split2flac +++ b/split2flac @@ -48,7 +48,7 @@ REPLAY_GAIN=0 FORMAT="${0##*split2}" DIR="." OUTPATTERN="@artist/{@year - }@album/@track - @title.@ext" -COPYMASKS="[Cc]overs \*.log \*.txt \*.jpg \*.cbr" +COPYMASKS="[Cc]overs *.log *.txt *.jpg *.cbr" COPYFILES=1 ENCA_ARGS="" @@ -480,7 +480,11 @@ split_file () { PATTERN=$(update_pattern "${PATTERN}" "ext" "${FORMAT}") # construct output directory name - OUT="${DIR}" + if [ $(echo "$DIR" | cut -c 1) == "/" ] ; then + OUT="${DIR}" + else + OUT="$(pwd)/$DIR" + fi if [ ${NOSUBDIRS} -eq 0 ]; then # add path from the pattern @@ -680,11 +684,11 @@ split_file () { eval "for i in ${COPYMASKS}; do \ test -r \"\$i\" && \ echo \" +> \$i\" 2>/dev/null; done" - cd "${old}" if [ ${DRY} -ne 1 ]; then eval "for i in ${COPYMASKS}; do \ - test -r/\"${SDIR}/\$i\" && \ - cp -r \"${SDIR}/\$i\" \"\${OUT}/\"; done" + test -r \"\$i\" && \ + cp -r \"\$i\" \"\${OUT}/\"; done" + cd "${old}" fi fi