Tidying

Author: Neko-Box-Coder

Include/runcpp2/runcpp2.hpp

@@ -61,7 +61,7 @@ namespace runcpp2
                                     const std::vector<std::string>& runArgs,
                                     const Data::ScriptInfo* lastScriptInfo,
                                     Data::ScriptInfo& outScriptInfo,
-                                    const std::string& outputDir,
+                                    const std::string& buildOutputDir,
                                     int& returnStatus);
 }
 

Src/runcpp2/main.cpp

@@ -260,7 +260,7 @@ int main(int argc, char* argv[])
         ssLOG_BASE("    -s, --[s]how-config-path                Show where runcpp2 is reading the config from");
         ssLOG_BASE("    -t, --create-script-[t]emplate <file>   Creates/prepend runcpp2 script info template");
         ssLOG_BASE("    -w, --[w]atch                           Watch script changes and output any compiling errors");
-        ssLOG_BASE("    -b, --[b]uild                           Build the script and copy output files to the script's directory");
+        ssLOG_BASE("    -b, --[b]uild                           Build the script and copy output files to the working directory");
 
         return 0;
     }

Src/runcpp2/runcpp2.cpp

@@ -482,7 +482,7 @@ runcpp2::StartPipeline( const std::string& scriptPath,
                         const std::vector<std::string>& runArgs,
                         const Data::ScriptInfo* lastScriptInfo,
                         Data::ScriptInfo& outScriptInfo,
-                        const std::string& outputDir,
+                        const std::string& buildOutputDir,
                         int& returnStatus)
 {
     INTERNAL_RUNCPP2_SAFE_START();
@@ -977,33 +977,39 @@ runcpp2::StartPipeline( const std::string& scriptPath,
         }
         else
         {
+            std::error_code e;
+            
             // Copy the output file
-            ghc::filesystem::path destFile = ghc::filesystem::path(outputDir) / target.filename();
-            std::error_code ec;
-            ghc::filesystem::copy(  target, destFile, 
-                                    ghc::filesystem::copy_options::overwrite_existing, ec);
-            if(ec)
             {
-                ssLOG_ERROR("Failed to copy output file: " << ec.message());
-                return PipelineResult::UNEXPECTED_FAILURE;
+                ghc::filesystem::path destFile = 
+                    ghc::filesystem::path(buildOutputDir) / target.filename();
+                
+                ghc::filesystem::copy(  target, destFile, 
+                                        ghc::filesystem::copy_options::overwrite_existing, e);
+                if(e)
+                {
+                    ssLOG_ERROR("Failed to copy output file: " << e.message());
+                    return PipelineResult::UNEXPECTED_FAILURE;
+                }
             }
 
             // Copy the files that need to be copied
             for(int i = 0; i < filesToCopyPaths.size(); ++i)
             {
                 ghc::filesystem::path srcFile(filesToCopyPaths.at(i));
                 ghc::filesystem::path destFile = 
-                    ghc::filesystem::path(outputDir) / srcFile.filename();
+                    ghc::filesystem::path(buildOutputDir) / srcFile.filename();
                 ghc::filesystem::copy(  srcFile, destFile, 
-                                        ghc::filesystem::copy_options::overwrite_existing, ec);
-                if(ec)
+                                        ghc::filesystem::copy_options::overwrite_existing, e);
+                if(e)
                 {
-                    ssLOG_ERROR("Failed to copy file " << filesToCopyPaths.at(i) << ": " << ec.message());
+                    ssLOG_ERROR("Failed to copy file " << filesToCopyPaths.at(i) << ": " << 
+                                e.message());
                     return PipelineResult::UNEXPECTED_FAILURE;
                 }
             }
 
-            ssLOG_INFO("Build completed. Files copied to " << outputDir);
+            ssLOG_INFO("Build completed. Files copied to " << buildOutputDir);
             return PipelineResult::SUCCESS;
         }
     }