diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/install_pkg.c | 18 | ||||
| -rw-r--r-- | src/update_all.c | 11 | ||||
| -rw-r--r-- | src/update_pkg.c | 3 | ||||
| -rw-r--r-- | src/vars.c | 8 |
4 files changed, 20 insertions, 20 deletions
diff --git a/src/install_pkg.c b/src/install_pkg.c index 0dedf81..2f4f88f 100644 --- a/src/install_pkg.c +++ b/src/install_pkg.c @@ -15,16 +15,16 @@ void install_pkg(Pkg pkg) { if (!pkg.is_local) { - printf("%sfetching source...\n", print_pkgit); + printf("%sfetching %s%s%s\n", print_pkgit, green, pkg.name, color_reset); fetch_src(pkg); - printf("%ssource fetched!\n", print_pkgit); + if (is_verbose) printf("%sfetched %s%s%s\n", print_pkgit, green, pkg.name, color_reset); } - printf("%sbuilding...\n", print_pkgit); + printf("%sbuilding %s%s%s\n", print_pkgit, green, pkg.name, color_reset); build(pkg); - printf("%sbuild complete!\n", print_pkgit); + if (is_verbose) printf("%sbuilt %s%s%s\n", print_pkgit, green, pkg.name, color_reset); - printf("%sinstalling...\n", print_pkgit); + printf("%sinstalling %s%s%s\n", print_pkgit, green, pkg.name, color_reset); if (is_auto_installed) { if (is_symlink_install) { link_install(pkg.src); @@ -32,7 +32,7 @@ void install_pkg(Pkg pkg) { copy_install(pkg.src); } } - printf("%s%s installed!\n", print_success, pkg.name); + printf("%sinstalled %s%s%s\n", print_success, green, pkg.name, color_reset); bool repo_exists = false; for (size_t i = 0; i < cached_repos_count; i++) { @@ -44,12 +44,12 @@ void install_pkg(Pkg pkg) { } if (!repo_exists) { - printf("%sadding repository...\n", print_pkgit); + printf("%sadding %s%s%s\n", print_pkgit, green, pkg.name, color_reset); if (pkg.url && strlen(pkg.url) > 0) { add_repo(pkg.url, pkg.name); } - printf("%sadded repository\n", print_pkgit); + printf("%sadded %s%s%s\n", print_pkgit, green, pkg.name, color_reset); } else { - if (is_verbose) printf("%srepo already exists, done!\n", print_pkgit); + if (is_verbose) printf("%srepo already exists, done\n", print_pkgit); } }
\ No newline at end of file diff --git a/src/update_all.c b/src/update_all.c index 85ad613..2d941eb 100644 --- a/src/update_all.c +++ b/src/update_all.c @@ -24,12 +24,11 @@ void update_all() { } while ((dirent_ptr = readdir(dir_ptr)) != NULL) { if (strcmp(dirent_ptr->d_name, "..") == 0 || strcmp(dirent_ptr->d_name, ".") == 0) continue; - printf("%sUpdating package: %s\n", print_pkgit, dirent_ptr->d_name); - struct stat stat_buf; - FILE* file_ptr = fopen(dirent_ptr->d_name, "r"); - if (!file_ptr) { continue; } - Pkg pkg = create_pkg(dirent_ptr->d_name, "default"); - update_pkg(pkg); + for (size_t i = 0; i < cached_repos_count; i++) { + if (!strcmp(dirent_ptr->d_name, cached_repos[i].source_key) == 0) continue; + Pkg pkg = create_pkg(cached_repos[i].source_value, "default"); + update_pkg(pkg); + } } closedir(dir_ptr); }
\ No newline at end of file diff --git a/src/update_pkg.c b/src/update_pkg.c index c0fdd92..093f25c 100644 --- a/src/update_pkg.c +++ b/src/update_pkg.c @@ -7,8 +7,9 @@ void update_pkg(Pkg pkg) { if (is_updated(pkg.src)) { - printf("%s%s is already up to date.\n", print_skipped, pkg.name); + printf("%s%s%s%s is already up to date.\n", print_skipped, green, pkg.name, color_reset); return; } + printf("%sUpdating package: %s%s%s\n", print_pkgit, green, pkg.name, color_reset); install_pkg(pkg); }
\ No newline at end of file @@ -162,7 +162,7 @@ void init_vars() { install_directories[4] = strdup(get_install_dir("src")); static char print_pkgit_buf[256]; - snprintf(print_pkgit_buf, sizeof(print_pkgit_buf), "%s[%s%s%s]\t%s", + snprintf(print_pkgit_buf, sizeof(print_pkgit_buf), "%s[%s%s%s] %s", bold_yellow, bold_magenta, "pkgit", bold_yellow, color_reset); print_pkgit = print_pkgit_buf; @@ -172,17 +172,17 @@ void init_vars() { print_success = print_success_buf; static char print_skipped_buf[256]; - snprintf(print_skipped_buf, sizeof(print_skipped_buf), "%s%s[SKIP]\t%s", + snprintf(print_skipped_buf, sizeof(print_skipped_buf), "%s%s[SKIP] %s", print_pkgit, blue, color_reset); print_skipped = print_skipped_buf; static char print_warning_buf[256]; - snprintf(print_warning_buf, sizeof(print_warning_buf), "%s%s[WARN]\t%s", + snprintf(print_warning_buf, sizeof(print_warning_buf), "%s%s[WARN] %s", print_pkgit, yellow, color_reset); print_warning = print_warning_buf; static char print_error_buf[256]; - snprintf(print_error_buf, sizeof(print_error_buf), "%s%s[ERROR]\t%s", + snprintf(print_error_buf, sizeof(print_error_buf), "%s%s[ERROR]%s", print_pkgit, red, color_reset); print_error = print_error_buf; } |