Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › affe73b
When fetching outside a TTY still give some feedback if not running in quiet
Bryan Drewery committed 11 years ago
commit affe73b3545de452cd75cbacab1bdb486c544361
parent 8c67e66
1 file changed +10 -4
modified src/event.c
@@ -357,7 +357,7 @@ event_callback(void *data, struct pkg_event *ev)
			printf("\n");

		break;

	case PKG_EVENT_FETCHING:
- 
		if (quiet || !isatty(STDOUT_FILENO))
+ 
		if (quiet)

			break;

		if (fetched == 0) {

			filename = strrchr(ev->e_fetching.url, '/');
@@ -371,12 +371,18 @@ event_callback(void *data, struct pkg_event *ev)
				filename = ev->e_fetching.url;

			}

			strlcpy(url, filename, sizeof(url));
- 
			start_progress_meter(url, ev->e_fetching.total,
- 
			    &fetched);
+ 
			if (isatty(STDOUT_FILENO))
+ 
				start_progress_meter(url, ev->e_fetching.total,
+ 
				    &fetched);
+ 
			else
+ 
				printf("Fetching %s...", url);

		}

		fetched = ev->e_fetching.done;

		if (ev->e_fetching.done == ev->e_fetching.total) {
- 
			stop_progress_meter();
+ 
			if (isatty(STDOUT_FILENO))
+ 
				stop_progress_meter();
+ 
			else
+ 
				printf(" done\n");

			fetched = 0;

		}

		break;