forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
68 lines
1.5 KiB
Diff
68 lines
1.5 KiB
Diff
From e9e3c3a27d4faad0000a10386da471227b0644d8 Mon Sep 17 00:00:00 2001
|
|
From: David Ward <david.ward@ll.mit.edu>
|
|
Date: Sat, 21 Dec 2019 00:32:05 -0500
|
|
Subject: [PATCH 20/26] alsa-info.sh: Exit script after writing information to
|
|
stdout
|
|
|
|
The '--stdout' option is mutually exclusive with uploading the file.
|
|
|
|
Signed-off-by: David Ward <david.ward@ll.mit.edu>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsa-info/alsa-info.sh | 17 ++++++-----------
|
|
1 file changed, 6 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
|
|
index bf353deceb7d..372d7ae3d692 100755
|
|
--- a/alsa-info/alsa-info.sh
|
|
+++ b/alsa-info/alsa-info.sh
|
|
@@ -349,9 +349,7 @@ case "$1" in
|
|
;;
|
|
--stdout)
|
|
DIALOG=""
|
|
- UPLOAD="no"
|
|
WELCOME="no"
|
|
- TOSTDOUT="yes"
|
|
;;
|
|
esac
|
|
done
|
|
@@ -720,6 +718,7 @@ if [ -n "$1" ]; then
|
|
fi
|
|
cat $FILE
|
|
rm $FILE
|
|
+ exit
|
|
;;
|
|
--about)
|
|
echo "Written/Tested by the following users of #alsa on irc.freenode.net:"
|
|
@@ -793,10 +792,8 @@ fi
|
|
|
|
if [ "$UPLOAD" = "no" ]; then
|
|
|
|
- if [ -z "$TOSTDOUT" ]; then
|
|
- mv -f $FILE $NFILE || exit 1
|
|
- KEEP_OUTPUT="yes"
|
|
- fi
|
|
+ mv -f $FILE $NFILE || exit 1
|
|
+ KEEP_OUTPUT="yes"
|
|
|
|
if [[ -n $DIALOG ]]
|
|
then
|
|
@@ -815,11 +812,9 @@ if [ "$UPLOAD" = "no" ]; then
|
|
echo "Your ALSA information is in $NFILE"
|
|
echo ""
|
|
else
|
|
- if [ -z "$TOSTDOUT" ]; then
|
|
- echo ""
|
|
- echo "Your ALSA information is in $NFILE"
|
|
- echo ""
|
|
- fi
|
|
+ echo ""
|
|
+ echo "Your ALSA information is in $NFILE"
|
|
+ echo ""
|
|
fi
|
|
fi
|
|
|
|
--
|
|
2.16.4
|
|
|