[EGIT] [tools/edi] master 02/02: Merge build fixes from 'arcpatch-D4917'

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=c608163e31620371eec33d8af6b8b0d45a9b86ee

commit c608163e31620371eec33d8af6b8b0d45a9b86ee
Merge: 9677bb4 792ca74
Author: Andy Williams <a...@andywilliams.me>
Date:   Sun Jun 25 09:17:16 2017 +0100

    Merge build fixes from 'arcpatch-D4917'

 src/bin/edi_build_main.c           |  3 ++-
 src/bin/edi_consolepanel.c         |  4 +++-
 src/bin/edi_debugpanel.c           |  6 +++---
 src/lib/edi_build_provider_cmake.c |  9 ++++++---
 src/lib/edi_build_provider_make.c  | 14 ++++++++++----
 src/lib/edi_create.c               |  3 ++-
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --cc src/bin/edi_build_main.c
index d21713f,b3230ab..6ca1a35
--- a/src/bin/edi_build_main.c
+++ b/src/bin/edi_build_main.c
@@@ -155,9 -154,17 +155,10 @@@ main(int argc, char **argv
          goto end;
       }
  
-    getcwd(path, PATH_MAX);
+    if (!getcwd(path, PATH_MAX))
+      goto end;
     edi_project_set(path);
  
 -   if (!edi_builder_can_build())
 -     {
 -        fprintf(stderr, "Cowardly refusing to build unknown project type.\n");
 -        ecore_shutdown();
 -        goto exit;
 -     }
 -
     if (args < argc)
       build_type = argv[args];
     if (!build_type)
diff --cc src/lib/edi_build_provider_make.c
index d3ac2d5,82aaa82..0a61635
--- a/src/lib/edi_build_provider_make.c
+++ b/src/lib/edi_build_provider_make.c
@@@ -87,8 -87,9 +90,10 @@@ _make_build(void
  static void
  _make_test(void)
  {
+    if (chdir(edi_project_get()) != 0)
+      ERR("Could not chdir");
 -   ecore_exe_pipe_run("env CK_VERBOSITY=verbose make check", 
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
 +   chdir(edi_project_get());
 +   ecore_exe_pipe_run("env CK_VERBOSITY=verbose" MAKE_COMMAND " check", 
ECORE_EXE_PIPE_READ_LINE_BUFFERED | ECORE_EXE_PIPE_READ |
                                ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR |
                                ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, NULL);
  }
diff --cc src/lib/edi_create.c
index de31d48,fe0df4d..0abfa75
--- a/src/lib/edi_create.c
+++ b/src/lib/edi_create.c
@@@ -162,23 -160,10 +162,24 @@@ _edi_create_filter_file_done(void *data
     handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, 
_edi_create_project_done, data);
     create->handler = handler;
  
-    chdir(create->path);
+    if (chdir(create->path) != 0)
+      ERR("Could not chdir");
  
 -   ecore_exe_run("sh -c 'git init && git add .'", data);
 +   command = eina_strbuf_new();
 +
 +   eina_strbuf_append(command, "sh -c 'git init && git add .");
 +
 +   if (create->user && strlen(create->user))
 +     eina_strbuf_append_printf(command, " && git config user.name \"%s\"", 
create->user);
 +
 +   if (create->email && strlen(create->email))
 +     eina_strbuf_append_printf(command, " && git config user.email \"%s\"", 
create->email);
 +
 +   eina_strbuf_append(command, " ' ");
 +
 +   ecore_exe_run(eina_strbuf_string_get(command), data);
 +
 +   eina_strbuf_free(command);
  
     return ECORE_CALLBACK_PASS_ON;
  }

--