From 9bc9838ceb9007121d9472cc7584b56923995c76 Mon Sep 17 00:00:00 2001 From: Nicholas O'Connor Date: Tue, 11 Jul 2017 16:24:50 -0700 Subject: [PATCH] that's what i get for not testing first --- include/internal/launch.hpp.cog | 1 - src/bottles/create.cpp | 4 +++- src/launch/winetricks.cpp | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/internal/launch.hpp.cog b/include/internal/launch.hpp.cog index 157775c..65c45b4 100644 --- a/include/internal/launch.hpp.cog +++ b/include/internal/launch.hpp.cog @@ -12,7 +12,6 @@ using namespace cellar::commands; namespace cellar { namespace launch { - extern void popen(string); extern void popen(vector); /*[[[cog diff --git a/src/bottles/create.cpp b/src/bottles/create.cpp index e62e478..b70dbe4 100644 --- a/src/bottles/create.cpp +++ b/src/bottles/create.cpp @@ -79,7 +79,9 @@ void cellar::bottles::create_bottle(int argc, vector argv) { output::statement("creating template bottle from scratch"); if (!dryrun) { setenv("WINEPREFIX", fullbottlepath.c_str(), 1); - launch::popen("wineboot -u"); + vector wineboot; + wineboot.push_back("wineboot"); wineboot.push_back("-u"); + launch::popen(wineboot); } } } diff --git a/src/launch/winetricks.cpp b/src/launch/winetricks.cpp index 123a672..d3149fa 100644 --- a/src/launch/winetricks.cpp +++ b/src/launch/winetricks.cpp @@ -21,9 +21,8 @@ void cellar::launch::winetricks(int argc, vector argv) { auto winetricks_argv = argv; winetricks_argv[0] = "winetricks"; - string winetricks_str = boost::algorithm::join(winetricks_argv, " "); //output::statement(winetricks_str); - launch::popen(winetricks_str); + launch::popen(winetricks_argv); if (bottles::active_bottle.config.find("winetricks") == bottles::active_bottle.config.end()) { bottles::active_bottle.config.emplace("winetricks", vector());