Fix bundling and installation on desktops

Signed-off-by: Daniel Francis <francis@sugarlabs.org>

4 files changed, 19 insertions, 9 deletions

diff --git a/desktopbuild.py b/desktopbuild.py
index d6ccac1..b817633 100644
--- a/desktopbuild.py
+++ b/desktopbuild.py
@@ -1,7 +1,4 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2012 S. Daniel Francis <francis@sugarlabs.org>
+# Copyright (C) 2012-2013 S. Daniel Francis <francis@sugarlabs.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,7 +45,9 @@ ignores = ['makescripts/activity_luncher.py',
            'makescripts/xobuild.py',
            'dist',
            'sugar',
-           'activity',
+           'activity/activity.info',
+           'activity/activity-graph-plotter.svg',
+           'activity/mimetypes.xml',
            'mimetypes.xml',
            'mimetype.png',
            info.lower_name + '.desktop',
@@ -81,7 +80,19 @@ def packdir(path, newpath=None):
                         new_filepath = os.path.join(filepath, name)
                         new_filename = new_filepath[2:]
                         if validate(new_filename):
-                            packdir(new_filepath, os.path.join(newpath, name))
+                           if os.path.isfile(new_filepath):
+                               new_path = list(os.path.split(
+                                       new_filename))
+                               if newpath:
+                                   global new_path
+                                   if newpath != '.':
+                                       new_path[0] = newpath
+                               manifest.append((new_filepath,
+                                                '/'.join(new_path)))
+                               print '%s listed to pack' % filename
+                           else:
+                               packdir(new_filepath,
+                                       os.path.join(newpath, name))
                 else:
                     if newpath:
                         packdir(filepath, os.path.join(newpath, filename))
diff --git a/svg2png.py b/svg2png.py
index 06eab59..a91546a 100644
--- a/svg2png.py
+++ b/svg2png.py
@@ -24,7 +24,5 @@ appdir = os.path.abspath('./')
 sys.path.append(appdir)
 import gtk
 
-import info
-
 pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(sys.argv[1], 48, 48)
 pixbuf.save(sys.argv[2], 'png')
diff --git a/systeminstall.py b/systeminstall.py
index faad71e..53127c9 100644
--- a/systeminstall.py
+++ b/systeminstall.py
@@ -22,6 +22,7 @@ import sys
 import os
 import pwd
 sys.path.append(os.path.abspath('./'))
+os.environ['INFO_L10N'] = '0'
 import info
 user = pwd.getpwuid(os.getuid()).pw_name
 
diff --git a/xobuild.py b/xobuild.py
index c92eca8..5661f38 100644
--- a/xobuild.py
+++ b/xobuild.py
@@ -90,7 +90,7 @@ def packdir(path, newpath=None):
                                        new_path[0] = newpath
                                manifest.append((new_filepath,
                                                 '/'.join(new_path)))
-                               print '%s listed to pack' % filename
+                               logger.info('%s listed to pack' % filename)
                            else:
                                packdir(new_filepath,
                                        os.path.join(newpath, name))