mirror of
https://github.com/YunoHost/moulinette.git
synced 2024-09-03 20:06:31 +02:00
Forked app fixes
This commit is contained in:
parent
c3371699e8
commit
779de154e4
1 changed files with 8 additions and 6 deletions
|
@ -30,6 +30,7 @@ import shutil
|
||||||
import stat
|
import stat
|
||||||
import yaml
|
import yaml
|
||||||
import time
|
import time
|
||||||
|
import re
|
||||||
from yunohost import YunoHostError, YunoHostLDAP, win_msg, random_password, is_true
|
from yunohost import YunoHostError, YunoHostLDAP, win_msg, random_password, is_true
|
||||||
from yunohost_domain import domain_list, domain_add
|
from yunohost_domain import domain_list, domain_add
|
||||||
from yunohost_user import user_info
|
from yunohost_user import user_info
|
||||||
|
@ -321,17 +322,18 @@ def app_install(app, label=None):
|
||||||
if 'multi_instance' not in manifest or not is_true(manifest['multi_instance']):
|
if 'multi_instance' not in manifest or not is_true(manifest['multi_instance']):
|
||||||
raise YunoHostError(1, _("App is already installed"))
|
raise YunoHostError(1, _("App is already installed"))
|
||||||
|
|
||||||
forked_app_id = app_id + '__' + instance_number
|
app_id_forked = app_id + '__' + str(instance_number)
|
||||||
|
|
||||||
# Replace app_id with the new one in scripts
|
# Replace app_id with the new one in scripts
|
||||||
for file in os.listdir(app_tmp_folder +'/scripts'):
|
for file in os.listdir(app_tmp_folder +'/scripts'):
|
||||||
#TODO: add hooks directory to the list
|
#TODO: add hooks directory to the list
|
||||||
#TODO: do it with sed ?
|
#TODO: do it with sed ?
|
||||||
with open(file, "r") as sources:
|
if file[:1] != '.':
|
||||||
lines = sources.readlines()
|
with open(app_tmp_folder +'/scripts/'+ file, "r") as sources:
|
||||||
with open(file, "w") as sources:
|
lines = sources.readlines()
|
||||||
for line in lines:
|
with open(app_tmp_folder +'/scripts/'+ file, "w") as sources:
|
||||||
sources.write(re.sub(r''+ app_id +'', app_id_forked, line))
|
for line in lines:
|
||||||
|
sources.write(re.sub(r''+ app_id +'', app_id_forked, line))
|
||||||
|
|
||||||
# Change app_id for the rest of the process
|
# Change app_id for the rest of the process
|
||||||
app_id = app_id_forked
|
app_id = app_id_forked
|
||||||
|
|
Loading…
Reference in a new issue