← Back to branch summary

~ted/ubuntu-app-launch/install-root

« back to all changes in this revision

Viewing changes to libubuntu-app-launch/jobs-systemd.cpp

  • Committer: Ted Gould
  • Date: 2017-01-30 21:03:12 UTC
  • Revision ID: ted@gould.cx-20170130210312-rci74dmp55xw6koc
Getting these variables figured out

Show diffs side-by-side

added added

removed removed

Lines of Context:
libubuntu-app-launch/jobs-systemd.cpp
444
444
 
445
445
        if (getenv("SNAP") == nullptr)
446
446
        {
447
 
            auto xmirenv = getenv("UBUNTU_APP_LAUNCH_XMIR_PATH");
 
447
            auto xmirenv = getenv("UBUNTU_APP_LAUNCH_XMIR_HELPER");
448
448
            if (xmirenv == nullptr)
449
449
            {
450
450
                retval.emplace(retval.begin(), XMIR_HELPER);
609
609
 
610
610
            copyEnv("DISPLAY", env);
611
611
 
612
 
            for (const auto prefix : {"DBUS_", "MIR_", "UBUNTU_APP_LAUNCH_"}){
 
612
            for (const auto prefix : {"DBUS_", "MIR_", "UBUNTU_APP_LAUNCH_"})
 
613
            {
613
614
                copyEnvByPrefix(prefix, env);
614
615
            }
615
616
 
619
620
            {
620
621
                copyEnvByPrefix("QT_", env);
621
622
                copyEnvByPrefix("XDG_", env);
 
623
                copyEnv("UBUNTU_APP_LAUNCH_XMIR_PATH", env);
622
624
            }
623
625
 
624
626
            if (!urls.empty())