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

App system fixes

Browse source
This commit is contained in:
Kload 2013-10-25 10:11:24 +00:00
parent 31ede61a99
commit c3371699e8
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
action_map.yml
View file

@ -333,7 +333,7 @@ app:
action: store_true action: store_true
### app_setting() ### app_setting()
addaccess: setting:
action_help: Set ou get an app setting value action_help: Set ou get an app setting value
api: GET /app/{app}/setting api: GET /app/{app}/setting
arguments: arguments:

21
yunohost_app.py
View file

@ -352,15 +352,19 @@ def app_install(app, label=None):
else: else:
app_setting(app_id, 'label', manifest['name']) app_setting(app_id, 'label', manifest['name'])
# Move scripts and manifest to the right place os.system('chown -R admin: '+ app_tmp_folder)
os.system('mv "'+ app_tmp_folder +'/manifest.json" "'+ app_tmp_folder +'/scripts" '+ app_setting_path)
# Execute App install script # Execute App install script
if hook_exec(app_setting_path+ '/scripts/install') != 0: if hook_exec(app_tmp_folder + '/scripts/install') == 0:
# Move scripts and manifest to the right place
os.system('mv "'+ app_tmp_folder +'/manifest.json" "'+ app_tmp_folder +'/scripts" '+ app_setting_path)
shutil.rmtree(app_tmp_folder)
os.system('chmod -R 400 '+ app_setting_path)
os.system('chown -R root: '+ app_setting_path)
win_msg(_("Installation complete"))
else:
#TODO: display script fail messages #TODO: display script fail messages
shutil.rmtree(app_setting_path) shutil.rmtree(app_setting_path)
raise YunoHostError(1, _("Installation failed"))
win_msg(_("Installation complete"))
def app_remove(app): def app_remove(app):
@ -375,8 +379,10 @@ def app_remove(app):
if not _is_installed(app): if not _is_installed(app):
raise YunoHostError(22, _("App is not installed")) raise YunoHostError(22, _("App is not installed"))
app_setting_path = apps_setting_path + app
#TODO: display fail messages from script #TODO: display fail messages from script
if hook_exec(apps_setting_path +'/'+ app + '/scripts/remove') != 0: if hook_exec(app_setting_path + '/scripts/remove') != 0:
pass pass
if os.path.exists(app_setting_path): shutil.rmtree(app_setting_path) if os.path.exists(app_setting_path): shutil.rmtree(app_setting_path)
@ -484,7 +490,6 @@ def app_setting(app, key, value=None):
with open(settings_file, 'w') as f: with open(settings_file, 'w') as f:
yaml.safe_dump(app_settings, f, default_flow_style=False) yaml.safe_dump(app_settings, f, default_flow_style=False)
return True
def _extract_app_from_file(path, remove=False): def _extract_app_from_file(path, remove=False):

6
yunohost_hook.py
View file

@ -117,4 +117,8 @@ def hook_exec(file, args=None):
else: else:
raise YunoHostError(22, _("Missing arguments") + ': ' + arg_name) raise YunoHostError(22, _("Missing arguments") + ': ' + arg_name)
return os.system('su - admin -c "bash \\"'+ file +'\\" '+ ' '.join(arg_list) +'"') #TODO: Allow python script file_path = "./"
if "/" in file and file[0:2] != file_path:
file_path = os.path.dirname(file)
file = file.replace(file_path +"/", "")
return os.system('su - admin -c "cd \\"'+ file_path +'\\" && bash \\"'+ file +'\\" '+ ' '.join(arg_list) +'"') #TODO: Allow python script