Merge pull request #6346 from conr2d/contract-path

Print the canonical path of wasm/abi when not found
EOSIO · Nov 20, 2018 · a37d1bd · a37d1bd
2 parents 32bea70 + 1641618
commit a37d1bd
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/programs/cleos/main.cpp b/programs/cleos/main.cpp
@@ -2476,9 +2476,7 @@ int main( int argc, char** argv ) {
       bytes code_bytes;
       if(!contract_clear){
         std::string wasm;
-        fc::path cpath(contractPath);
-
-        if( cpath.filename().generic_string() == "." ) cpath = cpath.parent_path();
+        fc::path cpath = fc::canonical(fc::path(contractPath));
 
         if( wasmPath.empty() )
            wasmPath = (cpath / (cpath.filename().generic_string()+".wasm")).generic_string();
@@ -2531,8 +2529,7 @@ int main( int argc, char** argv ) {
 
       bytes abi_bytes;
       if(!contract_clear){
-        fc::path cpath(contractPath);
-        if( cpath.filename().generic_string() == "." ) cpath = cpath.parent_path();
+        fc::path cpath = fc::canonical(fc::path(contractPath));
 
         if( abiPath.empty() ) {
            abiPath = (cpath / (cpath.filename().generic_string()+".abi")).generic_string();