diff --git a/README.md b/README.md index 3b8ac63..4efc5a3 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,9 @@ libc implementations. Jalali calendar provides an API similar to that of libc's Jalali calendar package consists of a library namely libjalali and two simple and easy to use terminal tools, jcal and jdate with functionality similar to UNIX cal and date. + + +--- + +This library was written and maintained by Ashkan Ghasemi, he passed away in an [accident](https://jadi.net/2017/10/ashkan-ghasemi/). +Therefore there is no way to migrate the original repository to another person, so this fork is for keep the project alive. diff --git a/sources/Makefile.am b/sources/Makefile.am index ec3e42b..0e93a41 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -1,6 +1,10 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libjalali src man test_kit +install-exec-hook:: + @echo "make[$(MAKELEVEL)]: Running ldconfig" + @sudo ldconfig + if WANT_PYJALALI install-exec-hook: @echo -e "\n###########################\n"\ diff --git a/sources/configure.ac b/sources/configure.ac index e623ec9..75f1da8 100644 --- a/sources/configure.ac +++ b/sources/configure.ac @@ -66,4 +66,7 @@ if test $installpyjalali = "yes"; then fi AM_CONDITIONAL([WANT_PYJALALI], [test $installpyjalali = "yes"]) +AC_PATH_PROG(RM, rm, $FALSE) +RM="$RM -f" + AC_OUTPUT diff --git a/sources/src/jcal.c b/sources/src/jcal.c index 3de534a..e4afb96 100644 --- a/sources/src/jcal.c +++ b/sources/src/jcal.c @@ -352,7 +352,11 @@ void show_cal(struct cal_layout* l, printf(" "); } - printf("%s%s%s", TERM_WHITE, cal_t[i], TERM_RESET); + if (l->color) { + printf("%s%s%s", TERM_WHITE, cal_t[i], TERM_RESET); + } else { + printf("%s", cal_t[i]); + } for (k=0; k<(cal_width - cal_tw[i] - @@ -372,13 +376,17 @@ void show_cal(struct cal_layout* l, for (i=0; in; i++) { for (k=0; k<6; k++) { - printf("%s%s%s ", TERM_WHITE, ptr_d[k], TERM_RESET); + if (l->color) { + printf("%s%s%s ", TERM_WHITE, ptr_d[k], TERM_RESET); + } else { + printf("%s ", ptr_d[k]); + } } if (l->color) printf("%s%s%s", TERM_RED, ptr_d[6], TERM_RESET); else - printf("%s%s%s", TERM_WHITE, ptr_d[6], TERM_RESET); + printf("%s", ptr_d[6]); if (i != m->n-1) { for (k=0; kmargin; k++) {