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

Merge pull request #25 from titoko/dev

Browse source 
fix app_remove
This commit is contained in:
Alexis Gavoty 2013-11-25 09:29:17 -08:00
commit de5b55bb02
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
yunohost_app.py
View file

@ -418,6 +418,7 @@ def app_install(app, label=None, args=None):
os.system('chmod -R 400 '+ app_setting_path)
os.system('chown -R root: '+ app_setting_path)
os.system('chown -R admin: '+ app_setting_path +'/scripts')
app_ssowatconf()
win_msg(_("Installation complete"))
else:
#TODO: display script fail messages
@ -439,16 +440,22 @@ def app_remove(app):
raise YunoHostError(22, _("App is not installed"))
app_setting_path = apps_setting_path + app
os.system('chmod -R 777 '+ app_setting_path)
#TODO: display fail messages from script
os.system('cp '+ app_setting_path + '/scripts/remove /tmp/yunohost_remove && chown admin: /tmp/yunohost_remove')
if hook_exec('/tmp/yunohost_remove') != 0:
os.system('chmod -hR 700 '+ app_setting_path)
try:
shutil.rmtree('/tmp/yunohost_remove')
except: pass
os.system('cp -a '+ app_setting_path + ' /tmp/yunohost_remove && chown -hR admin: /tmp/yunohost_remove')
os.system('chown -R admin: /tmp/yunohost_remove')
os.system('chmod -R u+rX /tmp/yunohost_remove')
if hook_exec('/tmp/yunohost_remove/scripts/remove') != 0:
pass
if os.path.exists(app_setting_path): shutil.rmtree(app_setting_path)
os.remove('/tmp/yunohost_remove')
app_ssowatconf()
win_msg(_("App removed: ")+ app)