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