Merge ~osomon/oxide:fix-app-pkgname into oxide:master

[Olivier Tilloy]

Use the APP_ID environment variable instead of APP_PKGNAME.

APP_PKGNAME is not an environment variable that is being set anywhere for click apps.
Fixes: https://launchpad.net/bugs/1260103.

[Chris Coulson (chrisccoulson)]

Thanks, it basically looks ok (there's a couple of minor comments)

review: Approve

[Olivier Tilloy (osomon)]

See my replies inline.

[Chris Coulson (chrisccoulson)]

Thanks, I've left a reply

52397b8... by Olivier Tilloy on 2016-08-25

Review tweaks.

diff --git a/shared/browser/oxide_browser_process_main.cc b/shared/browser/oxide_browser_process_main.cc
index 57e7cff..c205f32 100644
--- a/shared/browser/oxide_browser_process_main.cc
+++ b/shared/browser/oxide_browser_process_main.cc
@@ -242,9 +242,13 @@ base::FilePath GetSharedMemoryPath(base::Environment* env) {
   }
 
   // click packages
+  // Ref: https://developer.ubuntu.com/en/phone/platform/guides/app-confinement/#Runtime_Environment
   std::string app_pkgname;
-  if (env->GetVar("APP_PKGNAME", &app_pkgname)) {
-    return base::FilePath(std::string("/dev/shm/") + app_pkgname + ".oxide");
+  if (env->GetVar("APP_ID", &app_pkgname)) {
+    app_pkgname = app_pkgname.substr(0, app_pkgname.find("_"));
+    if (!app_pkgname.empty()) {
+      return base::FilePath(std::string("/dev/shm/") + app_pkgname + ".oxide");
+    }
   }
 
   // default