[Refactoring] Code cleanup and remove duplicate methods

[platform/core/dotnet/launcher.git] / NativeLauncher / tool / tac_installer.cc

diff --git a/NativeLauncher/tool/tac_installer.cc b/NativeLauncher/tool/tac_installer.cc
index 820ef5a..6bf9b57 100644 (file)
--- a/NativeLauncher/tool/tac_installer.cc
+++ b/NativeLauncher/tool/tac_installer.cc
@@ -40,16 +40,16 @@ static const char* __DOTNET_DIR = __STR(DOTNET_DIR);
 #undef __STR
 #undef __XSTR
 
-std::vector<std::string> nugetPackagesAssembliesSha;
-std::vector<std::string> tacDB;
-std::vector<std::string> createDirectories;
-std::vector<std::string> createLibraries;
-std::vector<std::string> updateTac;
-tac_state tacState = TAC_STATE_NONE;
+static std::vector<std::string> nugetPackagesAssembliesSha;
+static std::vector<std::string> tacDB;
+static std::vector<std::string> createDirectories;
+static std::vector<std::string> createLibraries;
+static std::vector<std::string> updateTac;
+static tac_state tacState = TAC_STATE_NONE;
 static sqlite3 *tac_db = NULL;
 static sqlite3 *tlc_db = NULL;
-bool tacPluginInstalled = false;
-bool tacPluginFinished = false;
+static bool tacPluginInstalled = false;
+static bool tacPluginFinished = false;
 
 static void createSHA256Info(std::string sha256Info, std::string nugetPackage)
 {
@@ -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());
                                        }
                                }
@@ -997,7 +997,7 @@ void install_Clean()
        }
 
        for (auto& cl : createLibraries) {
-               changeOwnershipTAC(cl);
+               copySmackAndOwnership(__DOTNET_DIR, cl);
        }
 }