Wrap output with double quotes

[scm/meta/abs.git] / abs

diff --git a/abs b/abs
index d61b584..52f7a26 100755 (executable)
--- a/abs
+++ b/abs
@@ -488,9 +488,9 @@ class Sdk(object):
             elif x['web_app'] == True:
                 print '\n\n PACKAGE WEB\n'
                 out = '%s\n%s' % (out, \
-                      self._run('package', main_args_web + ['--', x['path']]))
+                      self._run('package', main_args_web + ['--', os.path.join(x['path'], '.buildResult')]))
                 try:
-                    final_app = list_files(x['path'], ext='wgt')[0]
+                    final_app = list_files(os.path.join(x['path'], '.buildResult'), ext='wgt')[0]
                 except:
                     raise LocalError('WGT file not generated for %s.' % x['APPNAME'])
                 x['out_package'] = final_app
@@ -500,11 +500,11 @@ class Sdk(object):
             print 'THIS IS MULTI PROJECT'
             for i, x in enumerate(source.project_list):
                 if x['out_package'] != final_app and x.get('type') == 'app':
-                    extra_args.extend(['-r', x['out_package']])
+                    extra_args.extend(['-r', '"%s"' % x['out_package']])
                 elif x.get('type') == 'sharedLib':
-                    extra_args.extend(['-r', x['out_package']])
+                    extra_args.extend(['-r', '"%s"' % x['out_package']])
 
-            extra_args.extend(['--', final_app])
+            extra_args.extend(['--', '"%s"' % final_app])
             if final_app.endswith('.tpk'):
                 out = self._run('package', main_args + extra_args)
             elif final_app.endswith('.wgt'):
@@ -513,7 +513,7 @@ class Sdk(object):
         #TODO: signature validation check failed : Invalid file reference. An unsigned file was found.
         if final_app.endswith('.tpk'):
             print 'Packaging final step again!'
-            out = self._run('package', main_args + ['--', final_app])
+            out = self._run('package', main_args + ['--', '"%s"' % final_app])
 
         #Append arch to web binary
         if final_app.endswith('.wgt'):