* [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout
@ 2009-04-23 10:00 Luke Yelavich
2009-04-23 10:00 ` [PATCH] alsa-info.sh: use distros package manager to retrieve alsa library version Luke Yelavich
2009-04-23 10:19 ` [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout Takashi Iwai
0 siblings, 2 replies; 4+ messages in thread
From: Luke Yelavich @ 2009-04-23 10:00 UTC (permalink / raw)
To: alsa-devel; +Cc: Luke Yelavich
Add the --stdout command-line flag to allow displaying the collected alsa
information directly to standard output. This is useful for bug information
collecting systems, such as Ubuntu's apport.
Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
---
utils/alsa-info.sh | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh
index 0fff671..ee0de16 100755
--- a/utils/alsa-info.sh
+++ b/utils/alsa-info.sh
@@ -277,6 +277,12 @@ case "$1" in
REPEAT=""
shift
;;
+ --stdout)
+ DIALOG=""
+ NOUPLOAD="yes"
+ QUESTION="no"
+ TOSTDOUT="yes"
+ ;;
esac
done
@@ -627,6 +633,17 @@ then
fi
fi
;;
+ --stdout)
+ NOUPLOAD="yes"
+ withdevices
+ withconfigs
+ withaplay
+ withamixer
+ withalsactl
+ withlsmod
+ cat $FILE
+ rm $FILE
+ ;;
--about)
echo "Written/Tested by the following users of #alsa on irc.freenode.net:"
echo ""
@@ -635,6 +652,7 @@ then
echo " gnubien - Various script ideas / Testing"
echo " GrueMaster - HDA Intel specific items / Testing"
echo " olegfink - Script update function"
+ echo " TheMuso - display to stdout functionality"
exit 0
;;
*)
@@ -652,6 +670,8 @@ then
echo " --no-upload (do not upload contents to remote server)"
echo " --pastebin (use http://pastebin.ca) as remote server"
echo " instead www.alsa-project.org"
+ echo " --stdout (print alsa information to standard output"
+ echo " instead of a file)"
echo " --about (show some information about the script)"
echo " --debug (will run the script as normal, but will not"
echo " delete $FILE)"
@@ -668,7 +688,9 @@ fi
if [ -n "$NOUPLOAD" ]; then
- mv $FILE $NFILE || exit 1
+ if [ -z "$TOSTDOUT" ]; then
+ mv $FILE $NFILE || exit 1
+ fi
if [[ -n $DIALOG ]]
then
@@ -686,10 +708,12 @@ if [ -n "$NOUPLOAD" ]; then
echo "Your ALSA information can be seen by looking in $NFILE"
echo ""
else
- echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
- echo ""
- echo "Your ALSA information can be seen by looking in $NFILE"
- echo ""
+ if [ -z "$TOSTDOUT" ]; then
+ echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
+ echo ""
+ echo "Your ALSA information can be seen by looking in $NFILE"
+ echo ""
+ fi
fi
fi
--
1.6.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] alsa-info.sh: use distros package manager to retrieve alsa library version
2009-04-23 10:00 [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout Luke Yelavich
@ 2009-04-23 10:00 ` Luke Yelavich
2009-04-23 10:19 ` [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout Takashi Iwai
1 sibling, 0 replies; 4+ messages in thread
From: Luke Yelavich @ 2009-04-23 10:00 UTC (permalink / raw)
To: alsa-devel; +Cc: Luke Yelavich
Move the alsa library version retrieval code into a new function,
get_alsa_library_version. This new function uses the original checking of the
alsa library header file for the version. If nothing is found, then move
onto using various distro package managers to get the alsa library version.
This commit takes care of checks for Ubuntu and Debian only, so other distro
developers/users will have to provide code for their distro.
Using the distro package manager to determine the alsa version is useful in
cases where information has been requested from a user who doesn't have
development files for the alsa library installed, as many distros don't install
such files by default.
Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
---
utils/alsa-info.sh | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh
index ee0de16..f1660f8 100755
--- a/utils/alsa-info.sh
+++ b/utils/alsa-info.sh
@@ -241,6 +241,40 @@ withsysfs() {
fi
}
+get_alsa_library_version() {
+ ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
+
+ if [ -z "$ALSA_LIB_VERSION" ]; then
+ if [ -f /etc/lsb-release ]; then
+ . /etc/lsb-release
+ case "$DISTRIB_ID" in
+ Ubuntu)
+ if which dpkg > /dev/null ; then
+ ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -`
+ fi
+
+ if [ "$ALSA_LIB_VERSION" = "<none>" ]; then
+ ALSA_LIB_VERSION=""
+ fi
+ return
+ ;;
+ *)
+ return
+ ;;
+ esac
+ elif [ -f /etc/debian_version ]; then
+ if which dpkg > /dev/null ; then
+ ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -`
+ fi
+
+ if [ "$ALSA_LIB_VERSION" = "<none>" ]; then
+ ALSA_LIB_VERSION=""
+ fi
+ return
+ fi
+ fi
+}
+
#Run checks to make sure the programs we need are installed.
LSPCI=$(which lspci 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null);
@@ -356,7 +390,7 @@ KERNEL_MACHINE=`uname -m`
KERNEL_OS=`uname -o`
[[ `uname -v |grep SMP` ]] && KERNEL_SMP="Yes" || KERNEL_SMP="No"
ALSA_DRIVER_VERSION=`cat /proc/asound/version |head -n1|awk {'print $7'} |sed 's/\.$//'`
-ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
+get_alsa_library_version
ALSA_UTILS_VERSION=`amixer -v |awk {'print $3'}`
VENDOR_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $3}'|awk {'print substr($0, 2);}' >$TEMPDIR/vendor_id.tmp`
DEVICE_ID=`lspci -vn |grep 040[1-3] | awk -F':' '{print $4}'|awk {'print $1'} >$TEMPDIR/device_id.tmp`
--
1.6.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout
2009-04-23 10:00 [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout Luke Yelavich
2009-04-23 10:00 ` [PATCH] alsa-info.sh: use distros package manager to retrieve alsa library version Luke Yelavich
@ 2009-04-23 10:19 ` Takashi Iwai
1 sibling, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2009-04-23 10:19 UTC (permalink / raw)
To: Luke Yelavich; +Cc: alsa-devel
At Thu, 23 Apr 2009 20:00:33 +1000,
Luke Yelavich wrote:
>
> Add the --stdout command-line flag to allow displaying the collected alsa
> information directly to standard output. This is useful for bug information
> collecting systems, such as Ubuntu's apport.
>
> Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Looks good. Applied both patches now.
Thanks!
Takashi
> ---
> utils/alsa-info.sh | 34 +++++++++++++++++++++++++++++-----
> 1 files changed, 29 insertions(+), 5 deletions(-)
>
> diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh
> index 0fff671..ee0de16 100755
> --- a/utils/alsa-info.sh
> +++ b/utils/alsa-info.sh
> @@ -277,6 +277,12 @@ case "$1" in
> REPEAT=""
> shift
> ;;
> + --stdout)
> + DIALOG=""
> + NOUPLOAD="yes"
> + QUESTION="no"
> + TOSTDOUT="yes"
> + ;;
> esac
> done
>
> @@ -627,6 +633,17 @@ then
> fi
> fi
> ;;
> + --stdout)
> + NOUPLOAD="yes"
> + withdevices
> + withconfigs
> + withaplay
> + withamixer
> + withalsactl
> + withlsmod
> + cat $FILE
> + rm $FILE
> + ;;
> --about)
> echo "Written/Tested by the following users of #alsa on irc.freenode.net:"
> echo ""
> @@ -635,6 +652,7 @@ then
> echo " gnubien - Various script ideas / Testing"
> echo " GrueMaster - HDA Intel specific items / Testing"
> echo " olegfink - Script update function"
> + echo " TheMuso - display to stdout functionality"
> exit 0
> ;;
> *)
> @@ -652,6 +670,8 @@ then
> echo " --no-upload (do not upload contents to remote server)"
> echo " --pastebin (use http://pastebin.ca) as remote server"
> echo " instead www.alsa-project.org"
> + echo " --stdout (print alsa information to standard output"
> + echo " instead of a file)"
> echo " --about (show some information about the script)"
> echo " --debug (will run the script as normal, but will not"
> echo " delete $FILE)"
> @@ -668,7 +688,9 @@ fi
>
> if [ -n "$NOUPLOAD" ]; then
>
> - mv $FILE $NFILE || exit 1
> + if [ -z "$TOSTDOUT" ]; then
> + mv $FILE $NFILE || exit 1
> + fi
>
> if [[ -n $DIALOG ]]
> then
> @@ -686,10 +708,12 @@ if [ -n "$NOUPLOAD" ]; then
> echo "Your ALSA information can be seen by looking in $NFILE"
> echo ""
> else
> - echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
> - echo ""
> - echo "Your ALSA information can be seen by looking in $NFILE"
> - echo ""
> + if [ -z "$TOSTDOUT" ]; then
> + echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
> + echo ""
> + echo "Your ALSA information can be seen by looking in $NFILE"
> + echo ""
> + fi
> fi
> fi
>
> --
> 1.6.0.4
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout
@ 2009-03-30 0:03 Luke Yelavich
0 siblings, 0 replies; 4+ messages in thread
From: Luke Yelavich @ 2009-03-30 0:03 UTC (permalink / raw)
To: alsa-devel; +Cc: Luke Yelavich
Add the --stdout command-line flag to allow displaying the collected alsa
information directly to standard output. This is useful for bug information
collecting systems, such as Ubuntu's apport.
Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
---
utils/alsa-info.sh | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/utils/alsa-info.sh b/utils/alsa-info.sh
index b62c4d5..8340019 100755
--- a/utils/alsa-info.sh
+++ b/utils/alsa-info.sh
@@ -250,6 +250,12 @@ case "$1" in
REPEAT=""
shift
;;
+ --stdout)
+ DIALOG=""
+ NOUPLOAD="yes"
+ QUESTION="no"
+ TOSTDOUT="yes"
+ ;;
esac
done
@@ -596,6 +602,17 @@ then
fi
fi
;;
+ --stdout)
+ NOUPLOAD="yes"
+ withdevices
+ withconfigs
+ withaplay
+ withamixer
+ withalsactl
+ withlsmod
+ cat $FILE
+ rm $FILE
+ ;;
--about)
echo "Written/Tested by the following users of #alsa on irc.freenode.net:"
echo ""
@@ -604,6 +621,7 @@ then
echo " gnubien - Various script ideas / Testing"
echo " GrueMaster - HDA Intel specific items / Testing"
echo " olegfink - Script update function"
+ echo " TheMuso - display to stdout functionality"
exit 0
;;
*)
@@ -621,6 +639,8 @@ then
echo " --no-upload (do not upload contents to remote server)"
echo " --pastebin (use http://pastebin.ca) as remote server"
echo " instead www.alsa-project.org"
+ echo " --stdout (print alsa information to standard output"
+ echo " instead of a file)"
echo " --about (show some information about the script)"
echo " --debug (will run the script as normal, but will not"
echo " delete $FILE)"
@@ -637,7 +657,9 @@ fi
if [ -n "$NOUPLOAD" ]; then
- mv $FILE $NFILE || exit 1
+ if [ -z "$TOSTDOUT" ]; then
+ mv $FILE $NFILE || exit 1
+ fi
if [[ -n $DIALOG ]]
then
@@ -655,10 +677,12 @@ if [ -n "$NOUPLOAD" ]; then
echo "Your ALSA information can be seen by looking in $NFILE"
echo ""
else
- echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
- echo ""
- echo "Your ALSA information can be seen by looking in $NFILE"
- echo ""
+ if [ -z "$TOSTDOUT" ]; then
+ echo "You requested that your information was NOT automatically uploaded to the $WWWSERVICE"
+ echo ""
+ echo "Your ALSA information can be seen by looking in $NFILE"
+ echo ""
+ fi
fi
fi
--
1.6.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-04-23 10:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-23 10:00 [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout Luke Yelavich
2009-04-23 10:00 ` [PATCH] alsa-info.sh: use distros package manager to retrieve alsa library version Luke Yelavich
2009-04-23 10:19 ` [PATCH] alsa-info.sh: add command-line flag to print alsa info to stdout Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2009-03-30 0:03 Luke Yelavich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox