From: David Ward <david.ward@ll.mit.edu>
To: Takashi Iwai <tiwai@suse.de>, <alsa-devel@alsa-project.org>
Cc: David Ward <david.ward@ll.mit.edu>
Subject: [alsa-devel] [PATCH v2 alsa-utils 09/11] alsa-info.sh: Condense nested commands for formatting upload result
Date: Fri, 3 Jan 2020 12:55:56 -0500 [thread overview]
Message-ID: <1578074158-30328-10-git-send-email-david.ward@ll.mit.edu> (raw)
In-Reply-To: <1578074158-30328-1-git-send-email-david.ward@ll.mit.edu>
Signed-off-by: David Ward <david.ward@ll.mit.edu>
---
alsa-info/alsa-info.sh | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
index 987acb9..1bdb1aa 100755
--- a/alsa-info/alsa-info.sh
+++ b/alsa-info/alsa-info.sh
@@ -833,8 +833,10 @@ fi
if [[ -z $PASTEBIN ]]; then
wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://www.alsa-project.org/cardinfo-db/" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
+ FINAL_URL=$(grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2)
else
wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=blahblah" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
+ FINAL_URL=$(grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p')
fi
if [ -n "$DIALOG" ]; then
@@ -851,18 +853,8 @@ clear
fi # dialog
# See if tput is available, and use it if it is.
-if [ -n "$TPUT" ]; then
- if [[ -z $PASTEBIN ]]; then
- FINAL_URL=$(tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2 ; tput sgr0)
- else
- FINAL_URL=$(tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'; tput sgr0)
- fi
-else
- if [[ -z $PASTEBIN ]]; then
- FINAL_URL=$(grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2)
- else
- FINAL_URL=$(grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p')
- fi
+if [ -x "$TPUT" ]; then
+ FINAL_URL=$(tput setaf 1; printf '%s' "$FINAL_URL"; tput sgr0)
fi
# Output the URL of the uploaded file.
--
1.8.3.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2020-01-03 18:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 17:55 [alsa-devel] [PATCH v2 alsa-utils 00/11] alsa-info.sh: Improve output and fix file upload issues David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 01/11] alsa-info.sh: Consolidate PCI device output David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 02/11] alsa-info.sh: Read from /proc/modules and sort the result David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 03/11] alsa-info.sh: Simplify iteration over cards when calling amixer David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 04/11] alsa-info.sh: Use existing function to print ALSA configuration files David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 05/11] alsa-info.sh: Exit script after writing information to stdout David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 06/11] alsa-info.sh: Replace gauge with infobox for upload dialog David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 07/11] alsa-info.sh: Remove progress spinner during upload without dialog David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 08/11] alsa-info.sh: Condense nested commands for file upload David Ward
2020-01-03 17:55 ` David Ward [this message]
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 10/11] alsa-info.sh: Perform test for wget earlier David Ward
2020-01-03 17:55 ` [alsa-devel] [PATCH v2 alsa-utils 11/11] alsa-info.sh: Warn after actual upload failure; do not ping server David Ward
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1578074158-30328-10-git-send-email-david.ward@ll.mit.edu \
--to=david.ward@ll.mit.edu \
--cc=alsa-devel@alsa-project.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).