@@ -826,15 +826,19 @@ then
if [[ -n $DIALOG ]]
then
+ dialog --backtitle "$BGTITLE" --infobox "Uploading information to $WWWSERVICE ..." 6 70
+else
+ echo "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
@@ -844,19 +848,6 @@ fi
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 ""
-
fi # dialog
# See if tput is available, and use it if it is.
Signed-off-by: David Ward <david.ward@ll.mit.edu> --- alsa-info/alsa-info.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)