From b9178a874bb98e83cab3283dbc3500adcb5cf10c Mon Sep 17 00:00:00 2001 From: Adawat Chanchua Date: Sat, 13 Jan 2018 17:22:53 +0700 Subject: [PATCH] package's copy command has "clean" option (clean = delete before copy) --- src/wPackage/wPackage/main.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/wPackage/wPackage/main.cpp b/src/wPackage/wPackage/main.cpp index 152b55b..09ae5d2 100644 --- a/src/wPackage/wPackage/main.cpp +++ b/src/wPackage/wPackage/main.cpp @@ -172,8 +172,6 @@ void executeCommand(Value& commandCollection, Value& platformConf, string packag if (subCommand.compare("-reverse_copy") == 0) operMode = MODE_REVERSE_COPY; - bool isCopyCommand = command.compare("copy") == 0; - if (command.compare("copy") == 0 && (operMode == MODE_NORMAL || operMode == MODE_REVERSE_COPY)) { @@ -198,6 +196,18 @@ void executeCommand(Value& commandCollection, Value& platformConf, string packag break; } + bool isClean = false; + + if (commandCollection.HasMember("clean")) + isClean = string(commandCollection["clean"].GetString()).compare("true") == 0; + + if (isClean) { + + string cmd = string("rm -rf " + dstAbs); + cout << "clean cmd: " << cmd << endl; + cout << execute(cmd); + } + string cmd = string("cp -Rf ") + srcAbs + string(" ") + dstAbs; cout << "cmd: " << cmd << endl; string exeResult = execute(cmd);