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

Pass as argument to app script the main app label

Browse source
This commit is contained in:
Josué Tille 2020-03-30 17:44:05 +02:00
parent e82dad1881
commit 8ca07ad7d8
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/app.py
View file

@ -421,7 +421,7 @@ def app_upgrade(app=[], url=None, file=None):
""" """
from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback
from yunohost.permission import permission_sync_to_user from yunohost.permission import permission_sync_to_user, user_permission_list
apps = app apps = app
# If no app is specified, upgrade all apps # If no app is specified, upgrade all apps
@ -483,6 +483,7 @@ def app_upgrade(app=[], url=None, file=None):
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_APP_LABEL"] = user_permission_list(full=True, ignore_system_perms=True)['permissions'][app_id+".main"]['label']
# Start register change on system # Start register change on system
related_to = [('app', app_instance_name)] related_to = [('app', app_instance_name)]
@ -664,6 +665,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
raise YunohostError('app_id_invalid') raise YunohostError('app_id_invalid')
app_id = manifest['id'] app_id = manifest['id']
label = label if label else manifest['name']
# Check requirements # Check requirements
_check_manifest_requirements(manifest, app_id) _check_manifest_requirements(manifest, app_id)
@ -695,6 +697,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
env_dict["YNH_APP_LABEL"] = label
# Start register change on system # Start register change on system
operation_logger.extra.update({'env': env_dict}) operation_logger.extra.update({'env': env_dict})
@ -721,7 +724,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
# Set initial app settings # Set initial app settings
app_settings = { app_settings = {
'id': app_instance_name, 'id': app_instance_name,
'label': label if label else manifest['name'], 'label': label,
'install_time': int(time.time()), 'install_time': int(time.time()),
'current_revision': manifest.get('remote', {}).get('revision', "?") 'current_revision': manifest.get('remote', {}).get('revision', "?")
} }
@ -750,7 +753,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
# Initialize the main permission for the app # Initialize the main permission for the app
# After the install, if apps don't have a domain and path defined, the default url '/' is removed from the permission # After the install, if apps don't have a domain and path defined, the default url '/' is removed from the permission
permission_create(app_instance_name+".main", url="/", allowed=["all_users"], protected=False) permission_create(app_instance_name+".main", url="/", allowed=["all_users"], label=label, show_tile=True, protected=False)
# Execute the app install script # Execute the app install script
install_failed = True install_failed = True