From 56c61d07c3569a218681848a0aa06e46c0e4a223 Mon Sep 17 00:00:00 2001 From: lgromero Date: Tue, 25 Mar 2025 08:06:05 +0100 Subject: [PATCH] moves /bin to api/bin --- .gitignore | 1 - {bin => api/bin}/composer.phar | Bin {bin => api/bin}/console | 0 {bin => api/bin}/phpunit | 0 installer/ogdhcp_installer.sh | 5 ++++- 5 files changed, 4 insertions(+), 2 deletions(-) rename {bin => api/bin}/composer.phar (100%) rename {bin => api/bin}/console (100%) rename {bin => api/bin}/phpunit (100%) diff --git a/.gitignore b/.gitignore index 1e65fb0..75660fa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ !app/cache/.gitkeep !app/logs/.gitkeep /app/phpunit.xml -/bin/ /build/ /composer.phar /var/* diff --git a/bin/composer.phar b/api/bin/composer.phar similarity index 100% rename from bin/composer.phar rename to api/bin/composer.phar diff --git a/bin/console b/api/bin/console similarity index 100% rename from bin/console rename to api/bin/console diff --git a/bin/phpunit b/api/bin/phpunit similarity index 100% rename from bin/phpunit rename to api/bin/phpunit diff --git a/installer/ogdhcp_installer.sh b/installer/ogdhcp_installer.sh index b7f26b1..d44a9be 100755 --- a/installer/ogdhcp_installer.sh +++ b/installer/ogdhcp_installer.sh @@ -232,6 +232,7 @@ function copyServerFiles() { #public src .env + bin composer.json composer.lock phpunit.xml.dist @@ -242,6 +243,7 @@ function copyServerFiles() { #public src .env + bin composer.json composer.lock phpunit.xml.dist @@ -256,7 +258,7 @@ function copyServerFiles() { # Copiar ficheros. echoAndLog "${FUNCNAME}(): copying files to server directories" - pushd "$WORKDIR/ogdhcp" || return + pushd "$WORKDIR/ogdhcp/api" || return local i for (( i = 0; i < ${#SOURCES[@]}; i++ )); do if [ -f "${SOURCES[$i]}" ]; then @@ -269,6 +271,7 @@ function copyServerFiles() { warningAndLog "Unable to copy ${SOURCES[$i]} to $symfony_target/${TARGETS[$i]}" fi done + pushd "$WORKDIR/ogdhcp" || return # Copiar el directorio etc echoAndLog "Copying etc directory to $path_opengnsys_base" cp -a etc "$path_opengnsys_base"