diff --git a/src/emk.h b/src/emk.h index 68d6984..aecd1b9 100644 --- a/src/emk.h +++ b/src/emk.h @@ -21,7 +21,7 @@ #define EMK_H_ int checkForRoot(); -char checkForEmkFile(); +char checkForFiles(); char readEmkFile(); char includeConfig(); diff --git a/src/parse.c b/src/parse.c index 5d04a14..ea8f6d3 100644 --- a/src/parse.c +++ b/src/parse.c @@ -40,9 +40,9 @@ int checkForRoot() { } } -char checkForEmkFile() { +char checkForFiles() { char cwd[PATH_MAX]; - FILE *emkfile; + FILE *emkfile, *emkconfig; emkfile = fopen(EMKFILE, "r"); if (emkfile == NULL) { @@ -52,6 +52,17 @@ char checkForEmkFile() { printf(COL_BLUE "INF" COL_RESET " | using emkfile at %s/emkfile\n", cwd); } fclose(emkfile); + + emkconfig = fopen(EMKCONFIG, "r"); + if (emkconfig == NULL) { + printf(COL_YELLOW "WRN" COL_RESET " | config.emk does not exist\n"); + printf(COL_YELLOW "WRN" COL_RESET " | it is highly recommended to\n"); + printf(COL_YELLOW "WRN" COL_RESET " | use a config.emk file, rather\n"); + printf(COL_YELLOW "WRN" COL_RESET " | than embedding settings directly\n"); + printf(COL_YELLOW "WRN" COL_RESET " | within the emkfile.\n"); + } else if (gwtcwd(cwd, sizeof(cwd)) != NULL) { + printf(COL_BLUE "INF" COL_RESET " | using config.emk at %s/config.emk\n", cwd); + } } char readEmkFile() { @@ -104,8 +115,8 @@ char includeConfig() { } int main() { - checkForEmkFile(); - readEmkFile(); + checkForFiles(); + /* readEmkFile(); */ checkForRoot(); includeConfig(); }