diff --git a/ZipAllFoldersInDir/justZipIt.sh b/ZipAllFoldersInDir/justZipIt.sh index 3656146..0745a06 100755 --- a/ZipAllFoldersInDir/justZipIt.sh +++ b/ZipAllFoldersInDir/justZipIt.sh @@ -3,7 +3,7 @@ compressionlevel=5 while getopts l:h options do case $options in - l) compressionlevel="$OPTARG";; + l) compressionlevel=${OPTARG};; h) printf "\nLittle Bash script for converting all sub-folders of a folder\n\nUsage:\n.justZipIt.sh (or your alias) [-l compression level]\n\nStandard values:\ncompression level: 5\n\n" exit 2;; esac diff --git a/ffmpegConvertFolder/2L-145_01_stereo_01.cd.flac b/ffmpegConvertFolder/2L-145_01_stereo_01.cd.flac new file mode 100644 index 0000000..411ff1b Binary files /dev/null and b/ffmpegConvertFolder/2L-145_01_stereo_01.cd.flac differ diff --git a/ffmpegConvertFolder/convert.sh b/ffmpegConvertFolder/convert.sh old mode 100644 new mode 100755 index 7ff2f4d..adff8ed --- a/ffmpegConvertFolder/convert.sh +++ b/ffmpegConvertFolder/convert.sh @@ -18,21 +18,18 @@ typeofsecondparameter() { # Is the output parameter lossless or lossy fi } -outputogg() { # Change the file extension of the output to ogg instead of libvorbis - if [ "$output" == "libvorbis" ]; +libvorbistogg() { # Change the file extension of the output or input to ogg instead of libvorbis + inputOrOutput=$1 + if [ "$input" == "libvorbis" ] || [ "$output" == "libvorbis" ]; then extension="ogg" else - extension="$output" - fi -} - -inputogg() { # Change the file extension of the output to ogg instead of libvorbis - if [ "$input" == "libvorbis" ]; - then - extension="ogg" - else - extension="$input" + if [ "$inputOrOutput" == "in" ] + then + extension="$input" + else + extension="$output" + fi fi } @@ -94,7 +91,7 @@ else smallhelp elif [ "$inputfiletype" == "lossless" ] && [ "$outputfiletype" == "lossy" ]; # Lossless to Lossy then - outputogg + libvorbistogg "out" mkdir "$output" for i in *."$input"; do diff --git a/ffmpegConvertFolder/mp3/2L-145_01_stereo_01.cd.mp3 b/ffmpegConvertFolder/mp3/2L-145_01_stereo_01.cd.mp3 new file mode 100644 index 0000000..7f31c68 Binary files /dev/null and b/ffmpegConvertFolder/mp3/2L-145_01_stereo_01.cd.mp3 differ