diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2011-03-16 15:22:05 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2011-03-16 15:22:05 +0200 |
| commit | 20775276b934418ba451f76c9c8a24418201fa66 (patch) | |
| tree | bf5551aded838ae3a8c739e7d990a29dfb012d1d /src/state.c | |
| parent | 5d64bc5d8c7cdd2759e970f848e948fac9cc9577 (diff) | |
| download | apk-tools-20775276b934418ba451f76c9c8a24418201fa66.tar.gz apk-tools-20775276b934418ba451f76c9c8a24418201fa66.tar.bz2 apk-tools-20775276b934418ba451f76c9c8a24418201fa66.tar.xz apk-tools-20775276b934418ba451f76c9c8a24418201fa66.zip | |
apk: show progress bar by default for tty controlled runs
and make the progress bar disappear on regular runs too.
Diffstat (limited to 'src/state.c')
| -rw-r--r-- | src/state.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/state.c b/src/state.c index 4a4641d..7991802 100644 --- a/src/state.c +++ b/src/state.c @@ -655,7 +655,7 @@ static void apk_count_change(struct apk_change *change, struct apk_stats *stats) stats->packages ++; } -static inline void apk_draw_progress(int percent, int last) +static inline void apk_draw_progress(int percent) { char tmp[128]; char reset[128]; @@ -666,10 +666,7 @@ static inline void apk_draw_progress(int percent, int last) tmp[2+i] = '#'; memset(reset, '\b', strlen(tmp)); fwrite(tmp, strlen(tmp), 1, stderr); - if (!last) - fwrite(reset, strlen(tmp), 1, stderr); - else if (apk_verbosity > 0) - fwrite("\n", 1, 1, stderr); + fwrite(reset, strlen(tmp), 1, stderr); fflush(stderr); } @@ -692,7 +689,7 @@ static void progress_cb(void *ctx, size_t progress) prog->total.bytes + prog->total.packages); if (prog->count != count) - apk_draw_progress(count, 0); + apk_draw_progress(count); prog->count = count; } @@ -961,7 +958,7 @@ int apk_state_commit(struct apk_state *state, apk_count_change(change, &prog.done); } if (apk_flags & APK_PROGRESS) - apk_draw_progress(100, 1); + apk_draw_progress(100); update_state: apk_db_run_triggers(db); |