Merge pull request nwjs#4710 from ghostoy/issue-4681

rogerwang · rogerwang · commit 3603b2726e95 · 2016-04-15T13:06:44.000+08:00
Reordered path finding for backward compatible with nw12
diff --git a/src/nw_package.cc b/src/nw_package.cc
@@ -171,46 +171,52 @@ std::wstring ASCIIToWide(const std::string& ascii) {
 Package::Package()
     : path_(),
       self_extract_(true) {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  // LOG(INFO) << command_line->GetCommandLineString();
-  // Try to load from the folder where the exe resides.
+
+  base::FilePath path;
+  
+  // 1. try to extract self
+  self_extract_ = true;
+  path = GetSelfPath();
+  if (InitFromPath(path))
+    return;
+
+  // 2. try to load from the folder where the exe resides.
   // Note: self_extract_ is true here, otherwise a 'Invalid Package' error
   // would be triggered.
-  base::FilePath path = GetSelfPath().DirName();
+  path = GetSelfPath().DirName();
 #if defined(OS_MACOSX)
   path = path.DirName().DirName().DirName();
 #endif
   if (InitFromPath(path))
     return;
 
+  // 3. try to load from <exe-folder>/package.nw
   path = path.AppendASCII("package.nw");
   if (InitFromPath(path))
     return;
 
-  // Then see if we have arguments and extract it.
+  // 4. see if we have arguments and extract it.
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  // LOG(INFO) << command_line->GetCommandLineString();
   const base::CommandLine::StringVector& args = command_line->GetArgs();
 
+  // 4.1. try --nwapp= argument
   if (command_line->HasSwitch("nwapp")) {
     path = command_line->GetSwitchValuePath("nwapp");
     self_extract_ = false;
     if (InitFromPath(path))
       return;
   }
 
+  // 4.2 try first CLI argument
   if (args.size() > 0) {
     self_extract_ = false;
     path = FilePath(args[0]);
     if (InitFromPath(path))
       return;
   }
 
-  self_extract_ = true;
-  // Try to extract self.
-  path = GetSelfPath();
-  if (InitFromPath(path))
-    return;
-
-  // Finally we init with default settings.
+  // 5. init with default settings
   self_extract_ = false;
   InitWithDefault();
 }
