Make install take the full path rather than prefix. That way

it can be used to install in ~/Activities.
This commit is contained in:
Marco Pesenti Gritti 2008-03-30 23:03:39 +02:00
parent 9e9bed7ca8
commit d959426744

View File

@ -94,9 +94,6 @@ def _get_bundle_dir():
bundle_name = os.path.basename(_get_source_path()) bundle_name = os.path.basename(_get_source_path())
return bundle_name + '.activity' return bundle_name + '.activity'
def _get_install_dir(prefix):
return os.path.join(prefix, 'share/activities')
def _get_package_name(bundle_name): def _get_package_name(bundle_name):
bundle = ActivityBundle(_get_source_path()) bundle = ActivityBundle(_get_source_path())
zipname = '%s-%d.xo' % (bundle_name, bundle.get_activity_version()) zipname = '%s-%d.xo' % (bundle_name, bundle.get_activity_version())
@ -192,15 +189,14 @@ def cmd_dist(bundle_name, manifest):
bundle_zip.close() bundle_zip.close()
def cmd_install(bundle_name, manifest, prefix): def cmd_install(bundle_name, manifest, path):
cmd_dist(bundle_name, manifest) cmd_dist(bundle_name, manifest)
cmd_uninstall(prefix) cmd_uninstall(path)
_extract_bundle(_get_package_name(bundle_name), _extract_bundle(_get_package_name(bundle_name), path)
_get_install_dir(prefix))
def cmd_uninstall(prefix): def cmd_uninstall(path):
path = os.path.join(_get_install_dir(prefix), _get_bundle_dir()) path = os.path.join(path, _get_bundle_dir())
if os.path.isdir(path): if os.path.isdir(path):
shutil.rmtree(path) shutil.rmtree(path)