YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Add YNH_APP_INSTANCE_NAME for app instance, use YNH_APP_ID for original manifest id

Browse source
This commit is contained in:
Julien Malik 2016-03-18 16:55:04 +01:00
parent ace470e04a
commit 1c520c59b9
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/app.py
View file

@ -387,8 +387,9 @@ def app_upgrade(auth, app=[], url=None, file=None):
# Prepare env. var. to pass to script
env_dict = _make_environment_dict(args_odict)
app_id, app_instance_nb = _parse_app_instance_name(app_instance_name)
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
# Execute App upgrade script
os.system('chown -hR admin: %s' % install_tmp)
@ -482,8 +483,9 @@ def app_install(auth, app, label=None, args=None):
# Prepare env. var. to pass to script
env_dict = _make_environment_dict(args_odict)
env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
env_dict["YNH_APP_ID"] = app_instance_name
# Create app directory
app_setting_path = os.path.join(apps_setting_path, app_instance_name)