summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ward <david.ward@ll.mit.edu>2019-12-21 00:32:08 -0500
committerTakashi Iwai <tiwai@suse.de>2020-01-07 14:04:41 +0100
commitad49ee756bbc355aa2cf7e9931c81fde17a50913 (patch)
tree59a8644047ee07906bfd3561449335061616aa6a
parent1ebe877b8d89c74e76efd47f2a4dba6cfccf86af (diff)
downloadalsa-utils-ad49ee756bbc355aa2cf7e9931c81fde17a50913.tar.gz
alsa-info.sh: Condense nested commands for file upload
Signed-off-by: David Ward <david.ward@ll.mit.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rwxr-xr-xalsa-info/alsa-info.sh16
1 files changed, 6 insertions, 10 deletions
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
index 9bc8c38..7560b0d 100755
--- a/alsa-info/alsa-info.sh
+++ b/alsa-info/alsa-info.sh
@@ -828,15 +828,19 @@ then
if [[ -n $DIALOG ]]
then
+ dialog --backtitle "$BGTITLE" --infobox "Uploading information to $WWWSERVICE ..." 6 70
+else
+ echo -n "Uploading information to $WWWSERVICE ..."
+fi
if [[ -z $PASTEBIN ]]; then
- dialog --backtitle "$BGTITLE" --infobox "Uploading information to www.alsa-project.org ..." 6 70
wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://www.alsa-project.org/cardinfo-db/" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
else
- dialog --backtitle "$BGTITLE" --infobox "Uploading information to www.pastebin.ca ..." 6 70
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"
fi
+if [ -n "$DIALOG" ]; then
+
dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100
DIALOG_EXIT_CODE=$?
if [ $DIALOG_EXIT_CODE = 0 ]; then
@@ -849,14 +853,6 @@ clear
# no dialog
else
-if [[ -z $PASTEBIN ]]; then
- echo -n "Uploading information to www.alsa-project.org ... "
- wget -O - --tries=5 --timeout=60 --post-file=$FILE http://www.alsa-project.org/cardinfo-db/ &>$TEMPDIR/wget.tmp &
-else
- echo -n "Uploading information to www.pastebin.ca ... "
- wget -O - --tries=5 --timeout=60 --post-file=$FILE http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>$TEMPDIR/wget.tmp &
-fi
-
echo -e " Done!"
echo ""