nicole/cellar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

that's what i get for not testing first

Browse Source
This commit is contained in:
Nicholas O'Connor 2017-07-11 16:24:50 -07:00
parent 678acdec90
commit 9bc9838ceb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/internal/launch.hpp.cog
View File

@ -12,7 +12,6 @@ using namespace cellar::commands;
namespace cellar { namespace cellar {
namespace launch { namespace launch {
extern void popen(string);
extern void popen(vector<string>); extern void popen(vector<string>);
/*[[[cog /*[[[cog

4
src/bottles/create.cpp
View File

@ -79,7 +79,9 @@ void cellar::bottles::create_bottle(int argc, vector<string> argv) {
output::statement("creating template bottle from scratch"); output::statement("creating template bottle from scratch");
if (!dryrun) { if (!dryrun) {
setenv("WINEPREFIX", fullbottlepath.c_str(), 1); setenv("WINEPREFIX", fullbottlepath.c_str(), 1);
launch::popen("wineboot -u"); vector<string> wineboot;
wineboot.push_back("wineboot"); wineboot.push_back("-u");
launch::popen(wineboot);
} }
} }
} }

3
src/launch/winetricks.cpp
View File

@ -21,9 +21,8 @@ void cellar::launch::winetricks(int argc, vector<string> argv) {
auto winetricks_argv = argv; auto winetricks_argv = argv;
winetricks_argv[0] = "winetricks"; winetricks_argv[0] = "winetricks";
string winetricks_str = boost::algorithm::join(winetricks_argv, " ");
//output::statement(winetricks_str); //output::statement(winetricks_str);
launch::popen(winetricks_str); launch::popen(winetricks_argv);
if (bottles::active_bottle.config.find("winetricks") == bottles::active_bottle.config.end()) { if (bottles::active_bottle.config.find("winetricks") == bottles::active_bottle.config.end()) {
bottles::active_bottle.config.emplace("winetricks", vector<string>()); bottles::active_bottle.config.emplace("winetricks", vector<string>());