cura-system-paths.patch

   1 # Use system paths
   2 diff --git a/Cura/util/pluginInfo.py b/Cura/util/pluginInfo.py
   3 index 7290c8b..52fa14b 100644
   4 --- a/Cura/util/pluginInfo.py
   5 +++ b/Cura/util/pluginInfo.py
   6 @@ -80,14 +80,7 @@ def setPostProcessPluginConfig(config):
   7         profile.putProfileSetting('plugin_config', pickle.dumps(config))
   8
   9  def getPluginBasePaths():
  10 -       ret = []
  11 -       if platform.system() != "Windows":
  12 -               ret.append(os.path.expanduser('~/.cura/plugins/'))
  13 -       if platform.system() == "Darwin" and hasattr(sys, 'frozen'):
  14 -               ret.append(os.path.normpath(os.path.join(resources.resourceBasePath, "plugins")))
  15 -       else:
  16 -               ret.append(os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'plugins')))
  17 -       return ret
  18 +       return [os.path.expanduser('~/.cura/plugins/'), '/usr/share/cura/plugins']
  19
  20  def getPluginList(pluginType):
  21         global _pluginList
  22 diff --git a/Cura/util/resources.py b/Cura/util/resources.py
  23 index e63230b..99bb5ce 100644
  24 --- a/Cura/util/resources.py
  25 +++ b/Cura/util/resources.py
  26 @@ -28,7 +28,7 @@ if sys.platform.startswith('darwin'):
  27         else:
  28                 resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources")
  29  else:
  30 -       resourceBasePath = os.path.join(os.path.dirname(__file__), "../../resources")
  31 +       resourceBasePath = "/usr/share/cura"
  32
  33  def getPathForResource(dir, subdir, resource_name):
  34         assert os.path.isdir(dir), "{p} is not a directory".format(p=dir)