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
112 lines
4.9 KiB
Diff
112 lines
4.9 KiB
Diff
From fe322c46e6c2ae6ce130eed70f33a42fc4f6295a Mon Sep 17 00:00:00 2001
|
|
From: David Ward <david.ward@ll.mit.edu>
|
|
Date: Sat, 21 Dec 2019 00:32:10 -0500
|
|
Subject: [PATCH 25/26] alsa-info.sh: Perform test for wget earlier
|
|
|
|
If wget is not present, do not ask about uploading the information.
|
|
|
|
Signed-off-by: David Ward <david.ward@ll.mit.edu>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsa-info/alsa-info.sh | 73 ++++++++++++++++++++++++--------------------------
|
|
1 file changed, 35 insertions(+), 38 deletions(-)
|
|
|
|
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
|
|
index 8b4745b68958..399d662b0228 100755
|
|
--- a/alsa-info/alsa-info.sh
|
|
+++ b/alsa-info/alsa-info.sh
|
|
@@ -769,6 +769,41 @@ if [ -z "$WITHALL" ]; then
|
|
withall
|
|
fi
|
|
|
|
+# Check if wget is installed, and supports --post-file.
|
|
+if ! wget --help 2>/dev/null | grep -q post-file; then
|
|
+ # We couldn't find a suitable wget. If --upload was passed, tell the user to upload manually.
|
|
+ if [ "$UPLOAD" != "yes" ]; then
|
|
+ :
|
|
+ elif [ -n "$DIALOG" ]; then
|
|
+ if [ -z "$PASTEBIN" ]; then
|
|
+ dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.alsa-project.org/cardinfo-db/ and submit your post." 25 100
|
|
+ else
|
|
+ dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
|
|
+ fi
|
|
+ else
|
|
+ if [ -z "$PASTEBIN" ]; then
|
|
+ echo ""
|
|
+ echo "Could not automatically upload output to http://www.alsa-project.org"
|
|
+ echo "Possible reasons are:"
|
|
+ echo " 1. Couldn't find 'wget' in your PATH"
|
|
+ echo " 2. Your version of wget is less than 1.8.2"
|
|
+ echo ""
|
|
+ echo "Please manually upload $NFILE to http://www.alsa-project.org/cardinfo-db/ and submit your post."
|
|
+ echo ""
|
|
+ else
|
|
+ echo ""
|
|
+ echo "Could not automatically upload output to http://www.pastebin.ca"
|
|
+ echo "Possible reasons are:"
|
|
+ echo " 1. Couldn't find 'wget' in your PATH"
|
|
+ echo " 2. Your version of wget is less than 1.8.2"
|
|
+ echo ""
|
|
+ echo "Please manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post."
|
|
+ echo ""
|
|
+ fi
|
|
+ fi
|
|
+ UPLOAD="no"
|
|
+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
|
|
@@ -822,10 +857,6 @@ if [ "$UPLOAD" = "no" ]; then
|
|
|
|
fi # UPLOAD
|
|
|
|
-# Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it does not.
|
|
-if [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ $(wget --help | grep post-file) ]]
|
|
-then
|
|
-
|
|
if [[ -n $DIALOG ]]
|
|
then
|
|
dialog --backtitle "$BGTITLE" --infobox "Uploading information to $WWWSERVICE ..." 6 70
|
|
@@ -873,37 +904,3 @@ fi
|
|
echo "Your ALSA information is located at $FINAL_URL"
|
|
echo "Please inform the person helping you."
|
|
echo ""
|
|
-
|
|
-# We couldnt find a suitable wget, so tell the user to upload manually.
|
|
-else
|
|
- mv -f $FILE $NFILE || exit 1
|
|
- KEEP_OUTPUT="yes"
|
|
- if [[ -z $DIALOG ]]
|
|
- then
|
|
- if [[ -z $PASTEBIN ]]; then
|
|
- echo ""
|
|
- echo "Could not automatically upload output to http://www.alsa-project.org"
|
|
- echo "Possible reasons are:"
|
|
- echo " 1. Couldnt find 'wget' in your PATH"
|
|
- echo " 2. Your version of wget is less than 1.8.2"
|
|
- echo ""
|
|
- echo "Please manually upload $NFILE to http://www.alsa-project.org/cardinfo-db/ and submit your post."
|
|
- echo ""
|
|
- else
|
|
- echo ""
|
|
- echo "Could not automatically upload output to http://www.pastebin.ca"
|
|
- echo "Possible reasons are:"
|
|
- echo " 1. Couldnt find 'wget' in your PATH"
|
|
- echo " 2. Your version of wget is less than 1.8.2"
|
|
- echo ""
|
|
- echo "Please manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post."
|
|
- echo ""
|
|
- fi
|
|
- else
|
|
- if [[ -z $PASTEBIN ]]; then
|
|
- dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100
|
|
- else
|
|
- dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
|
|
- fi
|
|
- fi
|
|
-fi
|
|
--
|
|
2.16.4
|
|
|