From 2b44e6c11c973c2d901c75ab1e87753bc5bc2903 Mon Sep 17 00:00:00 2001 From: lgromero Date: Wed, 29 May 2024 16:09:41 +0200 Subject: [PATCH] refs #404 Fix symfony installation using composer.phar installed --- installer/ogboot_installer.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/installer/ogboot_installer.py b/installer/ogboot_installer.py index 7cb717d..499bac5 100755 --- a/installer/ogboot_installer.py +++ b/installer/ogboot_installer.py @@ -365,15 +365,15 @@ def create_ogboot_project(path_opengnsys_base): subprocess.run(["sudo", "chmod", "-R", "755", path_opengnsys_base]) subprocess.run(["sudo", "chown", "-R", "ogboot:ogboot", path_opengnsys_base]) - # Ejecutar Composer como el usuario 'ogboot' para instalar el proyecto Symfony - # result = subprocess.run(["sudo", "-u", "ogboot", "composer", "install", "--no-interaction", "--working-dir", path_opengnsys_base]) + # Ejecutar Composer como el usuario 'ogboot' para instalar el proyecto Symfony + # result = subprocess.run(["sudo", "-u", "ogboot", "composer", "install", "--no-interaction", "--working-dir", path_opengnsys_base]) + os.chdir(os.path.join(path_opengnsys_base, 'bin')) result = subprocess.run(["sudo", "-u", "ogboot", "php", os.path.join(path_opengnsys_base, "bin", "composer.phar"), "install", "--no-interaction", "--working-dir", path_opengnsys_base]) if result.returncode != 0: print("Error al crear el proyecto Symfony usando Composer") return - os.chdir(path_opengnsys_base) - + result = subprocess.run(["sudo", "-u", "ogboot", "php", os.path.join(path_opengnsys_base, "bin", "composer.phar"), "install", "--no-interaction", "--working-dir", path_opengnsys_base]) # Eliminar composer.lock si existe composer_lock_path = os.path.join(path_opengnsys_base, "composer.lock") if os.path.exists(composer_lock_path): @@ -822,9 +822,8 @@ def generate_ipxe_script(): # with open(ipxe_output, "w") as ipxe_file: # ipxe_file.write(ipxe_content) - template_default = "ogboot/tftpboot/ipxe_scripts/default.ipxe" - default_output = "/opt/ogboot/tftpboot/ipxe_scripts/default.ipxe" - + template_default = os.path.join(WORKDIR, "ogboot/tftpboot/ipxe_scripts/default.ipxe") + default_output = os.path.join(INSTALL_TARGET, "tftpboot/ipxe_scripts/default.ipxe") with open(template_default, "r") as default_tmpl_file: default_template_content = default_tmpl_file.read() default_ipxe_content = default_template_content.replace("__SERVERIP__", ip_address_server)