Refactor sugar.env and paths

services/clipboard/sugar-clipboard

@@ -32,7 +32,7 @@ import dbus.glib
  
 from sugar import env
 
-sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/clipboard'))
+sys.path.insert(0, env.get_service_path('clipboard'))
 
 from clipboardservice import ClipboardService
 

services/console/sugar-console

@@ -7,6 +7,6 @@ import os
 import sys
 from sugar import env 
 
-sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/console'))
+sys.path.insert(0, env.get_service_path('console'))
 
 import console

services/datastore/sugar-data-store

@@ -24,7 +24,7 @@ import logging
 from sugar import logger
 from sugar import env
 
-sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/datastore'))
+sys.path.insert(0, env.get_service_path('datastore'))
 
 logger.start('data-store')
 logging.info('Starting the data store...')

services/presence/sugar-presence-service

@@ -24,7 +24,7 @@ import os
 from sugar import logger
 from sugar import env
 
-sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/presence'))
+sys.path.insert(0, env.get_service_path('presence'))
 
 logger.start('presenceservice')
 

services/presence2/sugar-presence-service2

@@ -24,7 +24,7 @@ import os
 from sugar import logger
 from sugar import env
 
-sys.path.insert(0, os.join.path(env.get_data_dir(), 'services/presence2'))
+sys.path.insert(0, env.get_service_path('presence2'))
 
 logger.start('presenceservice')