asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-19 01:29:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

alsa-info: Refactor "withall" logic

Browse source 
Previously, using --output, --no-upload, --upload and --pastebin
switches implied the withall switch.

A more intuitive logic would be that --with-all is disabled if you
use another --with* switch, such as --withdmesg, and only then.

Also update script version to reflect the behaviour change.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
David Henningsson 2014-08-22 10:31:41 +02:00 committed by Takashi Iwai
parent 4f569affc4
commit 808af5fdb0
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
alsa-info/alsa-info.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
SCRIPT_VERSION=0.4.63
SCRIPT_VERSION=0.4.64
CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
#################################################################################
@ -260,6 +260,7 @@ withall() {
withlsmod
withsysfs
withdmesg
WITHALL="no"
}
get_alsa_library_version() {
@ -629,7 +630,6 @@ fi
#If no command line options are specified, then run as though --with-all was specified
if [ -z "$1" ]; then
update
withall
pbcheck
fi
@ -642,7 +642,6 @@ if [ -n "$1" ]; then
case "$1" in
--pastebin)
update
withall
pbcheck
;;
--update)
@ -651,43 +650,45 @@ if [ -n "$1" ]; then
;;
--upload)
UPLOAD="yes"
withall
;;
--no-upload)
UPLOAD="no"
withall
;;
--output)
shift
NFILE="$1"
KEEP_OUTPUT="yes"
withall
;;
--debug)
echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
KEEP_FILES="yes"
echo ""
withall
;;
--with-all)
withall
;;
--with-aplay)
withaplay
WITHALL="no"
;;
--with-amixer)
withamixer
WITHALL="no"
;;
--with-alsactl)
withalsactl
WITHALL="no"
;;
--with-devices)
withdevices
WITHALL="no"
;;
--with-dmesg)
withdmesg
WITHALL="no"
;;
--with-configs)
WITHALL="no"
if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
then
echo "!!ALSA configuration files" >> $FILE
@ -717,7 +718,9 @@ if [ -n "$1" ]; then
;;
--stdout)
UPLOAD="no"
withall
if [ -z "$WITHALL" ]; then
withall
fi
cat $FILE
rm $FILE
;;
@ -766,6 +769,10 @@ if [ "$PROCEED" = "no" ]; then
exit 1
fi
if [ -z "$WITHALL" ]; then
withall
fi
if [ "$UPLOAD" = "ask" ]; then
if [ -n "$DIALOG" ]; then
dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80