emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-pkgdb, shutils: use red/bold, red/yellow and bold for

Browse Source 
msg_error, msg_warn and msg_normal respectively.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091015141731-9ci2bnvslqe5gq7j
This commit is contained in:
Juan RP
2009-10-15 16:17:31 +02:00
parent a344468556
commit 1febd85f42
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bin/xbps-pkgdb/main.c
View File

@ -31,6 +31,14 @@
#include <xbps_api.h> #include <xbps_api.h>
/* error messages in bold/red */
#define MSG_ERROR "\033[1m\033[31m"
/* warn messages in bold/yellow */
#define MSG_WARN "\033[1m\033[33m"
/* normal messages in bold */
#define MSG_NORMAL "\033[1m"
#define MSG_RESET "\033[m"
static void static void
write_plist_file(prop_dictionary_t dict, const char *file) write_plist_file(prop_dictionary_t dict, const char *file)
{ {
@ -109,8 +117,8 @@ main(int argc, char **argv)
plist = xbps_xasprintf("%s/%s/%s", root, XBPS_META_PATH, XBPS_REGPKGDB); plist = xbps_xasprintf("%s/%s/%s", root, XBPS_META_PATH, XBPS_REGPKGDB);
if (plist == NULL) { if (plist == NULL) {
printf("=> ERROR: couldn't find regpkdb file (%s)\n", printf("%s=> ERROR: couldn't find regpkdb file (%s)%s\n",
strerror(errno)); MSG_ERROR, strerror(errno), MSG_RESET);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -137,15 +145,18 @@ main(int argc, char **argv)
rv = xbps_register_pkg(dict, false); rv = xbps_register_pkg(dict, false);
if (rv == EEXIST) { if (rv == EEXIST) {
printf("%s=> %s-%s already registered.\n", printf("%s%s=> %s-%s already registered.%s\n", MSG_WARN,
in_chroot ? "[chroot] " : "", argv[1], argv[2]); in_chroot ? "[chroot] " : "", argv[1], argv[2],
MSG_RESET);
} else if (rv != 0) { } else if (rv != 0) {
printf("%s=> couldn't register %s-%s (%s).\n", printf("%s%s=> couldn't register %s-%s "
"(%s).%s\n", MSG_ERROR,
in_chroot ? "[chroot] " : "" , argv[1], argv[2], in_chroot ? "[chroot] " : "" , argv[1], argv[2],
strerror(rv)); strerror(rv), MSG_RESET);
} else { } else {
printf("%s=> %s-%s registered successfully.\n", printf("%s%s=> %s-%s registered successfully.%s\n",
in_chroot ? "[chroot] " : "", argv[1], argv[2]); MSG_NORMAL, in_chroot ? "[chroot] " : "",
argv[1], argv[2], MSG_RESET);
} }
} else if (strcasecmp(argv[0], "unregister") == 0) { } else if (strcasecmp(argv[0], "unregister") == 0) {
@ -155,16 +166,18 @@ main(int argc, char **argv)
rv = xbps_remove_pkg_dict_from_file(argv[1], plist); rv = xbps_remove_pkg_dict_from_file(argv[1], plist);
if (rv == ENOENT) { if (rv == ENOENT) {
printf("=> ERROR: %s not registered in database.\n", printf("%s=> ERROR: %s not registered "
argv[1]); "in database.%s\n", MSG_WARN, argv[1], MSG_RESET);
} else if (rv != 0) { } else if (rv != 0) {
printf("=> ERROR: couldn't unregister %s " printf("%s=> ERROR: couldn't unregister %s "
"from database (%s)\n", argv[1], strerror(rv)); "from database (%s)%s\n", MSG_ERROR,
argv[1], strerror(rv), MSG_RESET);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
printf("%s=> %s-%s unregistered successfully.\n", printf("%s%s=> %s-%s unregistered successfully.%s\n",
in_chroot ? "[chroot] " : "", argv[1], argv[2]); MSG_NORMAL, in_chroot ? "[chroot] " : "", argv[1],
argv[2], MSG_RESET);
} else if (strcasecmp(argv[0], "version") == 0) { } else if (strcasecmp(argv[0], "version") == 0) {
/* Prints version of an installed package */ /* Prints version of an installed package */

11
shutils/common_funcs.sh
View File

@ -1,5 +1,5 @@
#- #-
# Copyright (c) 2008 Juan Romero Pardines. # Copyright (c) 2008-2009 Juan Romero Pardines.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -61,11 +61,14 @@ msg_error()
{ {
[ -z "$1" ] && return 1 [ -z "$1" ] && return 1
# error messages in bold/red
printf "\033[1m\033[31m"
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
echo "[chroot] => ERROR: $1" echo "[chroot] => ERROR: $1"
else else
echo "=> ERROR: $1" echo "=> ERROR: $1"
fi fi
printf "\033[m"
exit 1 exit 1
} }
@ -74,20 +77,26 @@ msg_warn()
{ {
[ -z "$1" ] && return 1 [ -z "$1" ] && return 1
# warn messages in bold/yellow
printf "\033[1m\033[33m"
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
echo "[chroot] => WARNING: $1" echo "[chroot] => WARNING: $1"
else else
echo "=> WARNING: $1" echo "=> WARNING: $1"
fi fi
printf "\033[m"
} }
msg_normal() msg_normal()
{ {
[ -z "$1" ] && return 1 [ -z "$1" ] && return 1
# normal messages in bold
printf "\033[1m"
if [ -n "$in_chroot" ]; then if [ -n "$in_chroot" ]; then
echo "[chroot] => $1" echo "[chroot] => $1"
else else
echo "=> $1" echo "=> $1"
fi fi
printf "\033[m"
} }