diff --git a/src/config.h b/src/config.h index 144a076a..5a3ab9f1 100644 --- a/src/config.h +++ b/src/config.h @@ -158,10 +158,10 @@ namespace config { } struct prep_cmd_t { - prep_cmd_t(std::string &&do_cmd, std::string &&undo_cmd, bool &&elevated): - do_cmd(std::move(do_cmd)), undo_cmd(std::move(undo_cmd)), elevated(std::move(elevated)) {} - explicit prep_cmd_t(std::string &&do_cmd, bool &&elevated): - do_cmd(std::move(do_cmd)), elevated(std::move(elevated)) {} + prep_cmd_t(std::string &&do_cmd, std::string &&undo_cmd, bool elevated): + do_cmd(std::move(do_cmd)), undo_cmd(std::move(undo_cmd)), elevated(elevated) {} + explicit prep_cmd_t(std::string &&do_cmd, bool elevated): + do_cmd(std::move(do_cmd)), elevated(elevated) {} std::string do_cmd; std::string undo_cmd; bool elevated; diff --git a/src/process.cpp b/src/process.cpp index 5bf41894..b4e77f83 100644 --- a/src/process.cpp +++ b/src/process.cpp @@ -348,7 +348,7 @@ namespace proc { boost::filesystem::path working_dir = _app.working_dir.empty() ? find_working_directory(cmd.do_cmd, _env) : boost::filesystem::path(_app.working_dir); - BOOST_LOG(info) << "Executing Do Cmd: ["sv << cmd.do_cmd << ']'; + BOOST_LOG(info) << "Executing Do Cmd: ["sv << cmd.do_cmd << "] elevated: " << cmd.elevated; auto child = platf::run_command(cmd.elevated, true, cmd.do_cmd, working_dir, _env, _pipe.get(), ec, nullptr); if (ec) { @@ -920,7 +920,8 @@ namespace proc { prep_cmds.emplace_back( std::move(do_cmd), std::move(undo_cmd), - std::move(prep_cmd.elevated)); + prep_cmd.elevated + ); } }