[Lunar-commits] <lunar> always use wget progress bar style

[Peter de Ridder]

commit 9d4935e3612cc291a7091d87baa47a8ab65422bf
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sat, 31 Aug 2013 04:42:19 -0700
URL: https://github.com/lunar-linux/lunar/commit/9d4935e3612cc291a7091d87baa47a8ab65422bf

always use wget progress bar style
---
  libs/download.lunar             | +1/-1     
  plugins/download-generic.plugin | +1/-1     
  2 files changed, 2 insertions(+), 2 deletions(-)

--- a/libs/download.lunar
+++ b/libs/download.lunar
@@ -206,7 +206,7 @@ show_downloading()
 	if [ -n "$DOWNLOAD_PID" ]; then
 		DOWNLOAD_LOG=$(grep "^$MODULE:" "$TEMP_DOWNLOAD_PIDS" | cut -d: -f3)
 		if [ ! -d "/proc/$DOWNLOAD_PID" -a -f "$DOWNLOAD_LOG" ]; then
-			cat "$DOWNLOAD_LOG"
+			sed -e 's/^.*\r//' "$DOWNLOAD_LOG"
 			rm -f $DOWNLOAD_LOG
 		elif [ -f "$DOWNLOAD_LOG" ]; then
 			tail -s 0.1 -n 200 --follow=name --pid=$DOWNLOAD_PID "$DOWNLOAD_LOG"
--- a/plugins/download-generic.plugin
+++ b/plugins/download-generic.plugin
@@ -58,7 +58,7 @@ plugin_source_download_generic()  {
   [ -n   "$no_proxy" ] && export   no_proxy=$no_proxy
 
   verbose_msg "calling \"wget $WGET_OPTS \"$URL$2\" --output-document $TMP_FILE\""
-  if erase $TMP_FILE && wget $WGET_OPTS "$URL$2" --output-document "$TMP_FILE" ; then
+  if erase $TMP_FILE && wget --progress=bar:force $WGET_OPTS "$URL$2" --output-document "$TMP_FILE" ; then
     # looks like it worked
     if testpack $TMP_FILE ; then
       if [ "$TMP_FILE" != "$3/$2" ]; then