Skip to content

Commit

Permalink
Remove the Icinga 2 directory (if it's empty) after running uninstall…
Browse files Browse the repository at this point in the history
….exe

refs #11449
  • Loading branch information
gunnarbeutner committed Apr 20, 2016
1 parent 83e410a commit 3c3ed80
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions icinga-installer/icinga-installer.cpp
Expand Up @@ -181,18 +181,6 @@ static bool MoveDirectory(const std::string& source, const std::string& destinat
fop.fFlags = FOF_NO_UI;
if (SHFileOperation(&fop) != 0)
return false;

// XXX: reimplement
/*std::vector<std::string> paths;
paths.push_back(source);
Utility::GlobRecursive(source, "*", boost::bind(&CollectPaths, boost::ref(paths), _1), GlobDirectory);
Utility::GlobRecursive(source, "*", boost::bind(&CollectPaths, boost::ref(paths), _1), GlobFile);
std::reverse(paths.begin(), paths.end());
BOOST_FOREACH(const std::string& path, paths) {
(void)MoveFileEx(path.c_str(), NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
}*/
}

return true;
Expand Down Expand Up @@ -229,6 +217,8 @@ static int UpgradeNSIS(void)
std::string newNameVar = dataPath + "\\var";
if (!MoveDirectory(oldNameVar, newNameVar))
return 1;

_unlink(installPath.c_str());
}

return 0;
Expand Down

0 comments on commit 3c3ed80

Please sign in to comment.