Revert PR #509, #510 (#513)
[platform/core/dotnet/launcher.git] / NativeLauncher / tool / tac_installer.cc
index f512400..c01a616 100644 (file)
@@ -121,7 +121,7 @@ static bool copyAssemblyCreateSymlink(std::string binPath, std::string tacDir, s
                                                nuget_restoration = true;
                                                break;
                                        }
-                                       if (!copyFile(concatPath(binNiPath, niFile), concatPath(tac_version_dir, niFile))) {
+                                       if (exist(binNiPath) && !copyFile(concatPath(binNiPath, niFile), concatPath(tac_version_dir, niFile))) {
                                                _ERR("Failed to copy of %s", niFile.c_str());
                                        }
                                }
@@ -131,7 +131,7 @@ static bool copyAssemblyCreateSymlink(std::string binPath, std::string tacDir, s
                                        nuget_restoration = true;
                                        break;
                                }
-                               if (exist(concatPath(tac_version_dir, niFile))) {
+                               if (exist(concatPath(tac_version_dir, niFile)) && exist(binNiPath)) {
                                        bf::create_symlink(concatPath(tac_version_dir, niFile), concatPath(tacDir, niFile), error);
                                        if (error) {
                                                _ERR("Failed to create symlink %s file", concatPath(tacDir, niFile).c_str());
@@ -997,7 +997,7 @@ void install_Clean()
        }
 
        for (auto& cl : createLibraries) {
-               changeOwnershipTAC(cl);
+               copySmackAndOwnership(__DOTNET_DIR, cl);
        }
 }