From c95fc89fb77ee4cafe5300748f67cd8e8c5272c2 Mon Sep 17 00:00:00 2001 From: Alexander Lutay Date: Tue, 19 Jun 2018 15:45:05 +0200 Subject: [PATCH] TT#37257 Move translations upload from deployment.sh into ngcp-installer Change-Id: Ia67f4d105cf320d60ea44c8bc7a444f15b4fdbf3 --- templates/scripts/includes/deployment.sh | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh index bd090ee..8159eb6 100755 --- a/templates/scripts/includes/deployment.sh +++ b/templates/scripts/includes/deployment.sh @@ -1547,18 +1547,10 @@ EXTERNAL_DEV="${EXTERNAL_DEV}" GW="${GW}" EXTERNAL_NETMASK="${EXTERNAL_NETMASK}" EOF -} -prepare_translations() { - set_deploy_status "prepare_translations" - grml-chroot "${TARGET}" apt-get -y install ngcp-dev-tools - grml-chroot "${TARGET}" service mysql start - if ! grml-chroot "${TARGET}" ngcp-prepare-translations ; then - grml-chroot "${TARGET}" service mysql stop - die "Error: Failed to prepare ngcp-panel translations. Exiting." - fi - grml-chroot "${TARGET}" service mysql stop - set_deploy_status "ngcp-installer" + if "${TRUNK_VERSION}" && checkBootParam ngcpupload ; then + echo "NGCPUPLOAD=true" >> "${TARGET}/etc/ngcp-installer/config_deploy.inc" + fi } if "$NGCP_INSTALLER" ; then @@ -1602,10 +1594,6 @@ EOT die "Error during installation of ngcp. Find details at: ${TARGET}/tmp/ngcp-installer.log ${TARGET}/tmp/ngcp-installer-debug.log" fi - if $TRUNK_VERSION && checkBootParam ngcpupload ; then - prepare_translations - fi - # nuke files find "${TARGET}/var/log" -type f -size +0 -not -name \*.ini -exec sh -c ":> \${1}" sh {} \; :>$TARGET/var/run/utmp