Portability: column -n is Debian-specific

This commit is contained in:
Vincent Riquer 2015-03-12 20:15:25 +01:00
parent 14b7a54a93
commit b7ddf65331

View File

@ -4,19 +4,19 @@ printConfig() {
echo "General|Config file|$cffile" echo "General|Config file|$cffile"
[ -n "$ionice" ] && echo "|IO Nice|$ionice" [ -n "$ionice" ] && echo "|IO Nice|$ionice"
cat <<-EOF cat <<-EOF
|Load|$maxload |Load|$maxload
|Load Interval|$loadinterval |Load Interval|$loadinterval
|Temp Dir|$tempdir |Temp Dir|$tempdir
|Database|$database |Database|$database
|Debug|$debug |Debug|$debug
Source|Path|$sourcepath Source|Path|$sourcepath
EOF EOF
for prune_expression in "${skippeddirectories[@]}" for prune_expression in "${skippeddirectories[@]}"
do do
(( printed )) \ (( printed )) \
&& echo -n '||' \ && echo -n ' | |' \
|| echo -n '|Skipped directories|' || echo -n ' |Skipped directories|'
echo "$prune_expression" echo "$prune_expression"
printed=1 printed=1
done done
@ -26,32 +26,32 @@ printConfig() {
cat <<-EOF cat <<-EOF
$destination|Path|${destinationpath["$destination"]} $destination|Path|${destinationpath["$destination"]}
|Format|${destinationformat["$destination"]} |Format|${destinationformat["$destination"]}
|Quality|${destinationquality["$destination"]} |Quality|${destinationquality["$destination"]}
EOF EOF
if [[ ${destinationformat["$destination"]} == opus ]] if [[ ${destinationformat["$destination"]} == opus ]]
then then
echo "|Expected loss|${destinationloss["$destination"]}" echo " |Expected loss|${destinationloss["$destination"]}"
elif [[ ${destinationformat["$destination"]} == mp3 ]] elif [[ ${destinationformat["$destination"]} == mp3 ]]
then then
echo "|Prevent resampling|${destinationnoresample["$destination"]}" echo " |Prevent resampling|${destinationnoresample["$destination"]}"
fi fi
cat <<-EOF cat <<-EOF
|Normalize|${destinationnormalize["$destination"]} |Normalize|${destinationnormalize["$destination"]}
|Channels|${destinationchannels["$destination"]} |Channels|${destinationchannels["$destination"]}
|Frequency|${destinationfrequency["$destination"]} |Frequency|${destinationfrequency["$destination"]}
|Higher than|${destinationmaxbps["$destination"]} |Higher than|${destinationmaxbps["$destination"]}
|Fat32 Compat.|${destinationfat32compat["$destination"]} |Fat32 Compat.|${destinationfat32compat["$destination"]}
|ASCII Compat.|${destinationascii["$destination"]} |ASCII Compat.|${destinationascii["$destination"]}
|Path Change|${destinationrenamepath["$destination"]} |Path Change|${destinationrenamepath["$destination"]}
|File Rename|${destinationrename["$destination"]} |File Rename|${destinationrename["$destination"]}
EOF EOF
[ -n "${destinationskipmime["$destination"]}" ] \ [ -n "${destinationskipmime["$destination"]}" ] \
&& echo "|Skipped mime-types|${destinationskipmime["$destination"]//\|/ && echo " |Skipped mime-types|${destinationskipmime["$destination"]//\|/
||}" ||}"
[ -n "${destinationmskipime["$destination"]}" ] \ [ -n "${destinationmskipime["$destination"]}" ] \
&& echo "|Copied mime-types|${destinationcopymime["$destination"]//\|/ && echo " |Copied mime-types|${destinationcopymime["$destination"]//\|/
||}" ||}"
done done
}|column -t -s'|' -n }|column -t -s'|'
} }