paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Little fix for install paramecio without modules

Browse source
This commit is contained in:
Antonio de la Rosa 2016-08-25 01:04:16 +02:00
parent b5c05057e6
commit 67457d4d6c
1 changed files with 125 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

248
paramecio/console.py
View file

@ -288,131 +288,133 @@ def start():
# Install modules # Install modules
if args.modules.strip()!='': if args.modules!=None:
arr_modules=args.modules.split(',') if args.modules.strip()!='':
final_modules=[] arr_modules=args.modules.split(',')
final_modules_models=[] final_modules=[]
if len(arr_modules)>0: final_modules_models=[]
for k, module in enumerate(arr_modules): if len(arr_modules)>0:
module=module.strip() for k, module in enumerate(arr_modules):
try: module=module.strip()
u=urlparse(module) try:
module_path=os.path.basename(u.path) u=urlparse(module)
except: module_path=os.path.basename(u.path)
print('Error: not valid url for repository')
exit(1) except:
print('Error: not valid url for repository')
exit(1)
if call("git clone %s %s/modules/%s" % (module, path, module_path), shell=True) > 0:
print('Error, cannot install the module %s' % module_path)
exit(1) if call("git clone %s %s/modules/%s" % (module, path, module_path), shell=True) > 0:
else: print('Error, cannot install the module %s' % module_path)
print('Added module %s' % module_path) exit(1)
else:
final_modules.append(("modules/%s" % (module_path)).replace('/', '.')) print('Added module %s' % module_path)
final_modules_models.append("modules/%s" % (module_path))
final_modules.append(("modules/%s" % (module_path)).replace('/', '.'))
final_modules_models.append("modules/%s" % (module_path))
# Edit config.py # Edit config.py
with open(path_settings+'/config.py') as f: with open(path_settings+'/config.py') as f:
modules_final='\''+'\', \''.join(final_modules)+'\'' modules_final='\''+'\', \''.join(final_modules)+'\''
p=re.compile(r"^modules=\[(.*)\]$") p=re.compile(r"^modules=\[(.*)\]$")
#config_file=p.sub(r"modules=[\1, "+modules_final+"]", "modules=['paramecio.modules.welcome', 'paramecio.modules.admin', 'paramecio.modules.lang', 'modules.pastafari', 'modules.monit', 'modules.example']") #config_file=p.sub(r"modules=[\1, "+modules_final+"]", "modules=['paramecio.modules.welcome', 'paramecio.modules.admin', 'paramecio.modules.lang', 'modules.pastafari', 'modules.monit', 'modules.example']")
final_config='' final_config=''
for line in f: for line in f:
if p.match(line): if p.match(line):
line=p.sub(r"modules=[\1, "+modules_final+"]", line) line=p.sub(r"modules=[\1, "+modules_final+"]", line)
final_config+=line final_config+=line
with open(path_settings+'/config.py', 'w') as f: with open(path_settings+'/config.py', 'w') as f:
f.write(final_config) f.write(final_config)
print('Updated configuration for add new modules...') print('Updated configuration for add new modules...')
#Change workdir #Change workdir
real_dir=os.getcwd() real_dir=os.getcwd()
os.chdir(args.path) os.chdir(args.path)
#Regenerating modules.py #Regenerating modules.py
regenerate='regenerate.py' regenerate='regenerate.py'
os.chmod(regenerate, 0o755) os.chmod(regenerate, 0o755)
if call('./regenerate.py', shell=True) > 0: if call('./regenerate.py', shell=True) > 0:
print('Error, cannot regenerate the modules.py script') print('Error, cannot regenerate the modules.py script')
exit(1) exit(1)
else: else:
print('Regeneration of modules.py finished') print('Regeneration of modules.py finished')
# Installing models # Installing models
padmin='padmin.py' padmin='padmin.py'
os.chmod(padmin, 0o755) os.chmod(padmin, 0o755)
for mod_path in final_modules_models: for mod_path in final_modules_models:
models_path=mod_path+'/models' models_path=mod_path+'/models'
if os.path.isdir(models_path): if os.path.isdir(models_path):
models_files=os.listdir(models_path) models_files=os.listdir(models_path)
m=re.compile(".*\.py$") m=re.compile(".*\.py$")
underscore=re.compile("^__.*") underscore=re.compile("^__.*")
for f in models_files: for f in models_files:
if m.match(f) and not underscore.match(f): if m.match(f) and not underscore.match(f):
if call('./padmin.py --model '+models_path+'/'+f, shell=True) > 0: if call('./padmin.py --model '+models_path+'/'+f, shell=True) > 0:
print('Error, cannot create the modules of '+models_path+'/'+f) print('Error, cannot create the modules of '+models_path+'/'+f)
else: else:
print('Models from '+models_path+'/'+f+' created') print('Models from '+models_path+'/'+f+' created')
# Execute two times the loop because i can need good installed models for postscript script # Execute two times the loop because i can need good installed models for postscript script
# Execute postscript # Execute postscript
print('Executing postscripts') print('Executing postscripts')
for mod_path in final_modules_models: for mod_path in final_modules_models:
postscript=mod_path+"/install/postinstall.py" postscript=mod_path+"/install/postinstall.py"
os.chmod(padmin, 0o755) os.chmod(padmin, 0o755)
if os.path.isfile(postscript): if os.path.isfile(postscript):
os.chmod(postscript, 0o755) os.chmod(postscript, 0o755)
if call('./'+postscript, shell=True) > 0: if call('./'+postscript, shell=True) > 0:
print('Error, cannot execute the postinstall script') print('Error, cannot execute the postinstall script')
exit(1) exit(1)
else: else:
print('Postinstall script finished') print('Postinstall script finished')
if __name__=="__main__": if __name__=="__main__":