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

activate can now be run dry

Browse Source
This commit is contained in:
Nicholas O'Connor
2017-07-05 15:40:29 -07:00
parent 69b403fb36
commit 82dc5255b6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bottles/activate.cpp
View File

@@ -7,6 +7,7 @@
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include "bottles.hpp" #include "bottles.hpp"
#include "cellar.hpp"
#include "internal/bottles.hpp" #include "internal/bottles.hpp"
#include "output.hpp" #include "output.hpp"
@@ -36,9 +37,12 @@ void cellar::bottles::switch_active_bottle(int argc, vector<string> argv) {
output::error("refusing to clobber " + bottlepath + ": not a symlink"); output::error("refusing to clobber " + bottlepath + ": not a symlink");
return; return;
} }
remove(bottlepath); output::statement("removing existing symlink at " + bottlepath, true);
if (!cellar::dryrun) { remove(bottlepath); }
} }
output::statement("creating symlink to " + targetpath + " at " + bottlepath, true);
if (cellar::dryrun) { return; }
// TODO: not blindly assume this will magically work // TODO: not blindly assume this will magically work
try { try {
create_symlink(targetpath, bottlepath); create_symlink(targetpath, bottlepath);