Skip to content

Commit 9ea44e0

Browse files
koko-ngbbhtt
authored andcommitted
builder-module: Run shell before configure
Otherwise if the configure step fails, it impossible to open a shell in the build environment Fixes: #479
1 parent 9f5bd1a commit 9ea44e0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/builder-module.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,6 +1892,13 @@ builder_module_build_helper (BuilderModule *self,
18921892
}
18931893
}
18941894

1895+
if (run_shell)
1896+
{
1897+
if (!shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error))
1898+
return FALSE;
1899+
return TRUE;
1900+
}
1901+
18951902
if (configure_file)
18961903
has_configure = g_file_query_exists (configure_file, NULL);
18971904

@@ -2125,13 +2132,6 @@ builder_module_build_helper (BuilderModule *self,
21252132
make_j = g_strdup ("-j1");
21262133
}
21272134

2128-
if (run_shell)
2129-
{
2130-
if (!shell (app_dir, self->name, context, source_dir, build_dir_relative, build_args, env, error))
2131-
return FALSE;
2132-
return TRUE;
2133-
}
2134-
21352135
/* Build and install */
21362136

21372137
builder_set_term_title (_("Installing %s"), self->name);

0 commit comments

Comments
 (0)