From 5c632b59357faeff98cab2242687d1a6009f278b Mon Sep 17 00:00:00 2001 From: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Date: Sat, 6 Jul 2019 14:45:30 +0200 Subject: [PATCH] The copy process has been corrected because the package names have changed --- bin/scripts/docker-compile.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/scripts/docker-compile.sh b/bin/scripts/docker-compile.sh index 86915d25..a804d6ad 100644 --- a/bin/scripts/docker-compile.sh +++ b/bin/scripts/docker-compile.sh @@ -81,8 +81,8 @@ mkdir $SCRIPT_PATH/deploy >/dev/null 2>&1 # get Hyperion source, cleanup previous folder echo "---> Downloading Hyperion source code from ${GIT_REPO_URL}" -sudo rm -fr $SCRIPT_PATH/hyperion >/dev/null 2>&1 -git clone --recursive --depth 1 -q $GIT_REPO_URL $SCRIPT_PATH/hyperion || { echo "---> Failed to download Hyperion source code! Abort"; exit 1; } +sudo rm -fr $SCRIPT_PATH/hyperion.ng >/dev/null 2>&1 +git clone --recursive --depth 1 -q $GIT_REPO_URL $SCRIPT_PATH/hyperion.ng || { echo "---> Failed to download Hyperion source code! Abort"; exit 1; } # start compilation # Remove container after stop @@ -93,15 +93,15 @@ git clone --recursive --depth 1 -q $GIT_REPO_URL $SCRIPT_PATH/hyperion || { echo echo "---> Startup docker..." $DOCKER run --rm \ -v "${SCRIPT_PATH}/deploy:/deploy" \ - -v "${SCRIPT_PATH}/hyperion:/source:ro" \ + -v "${SCRIPT_PATH}/hyperion.ng:/source:ro" \ hyperionproject/hyperion-ci:$BUILD_TARGET \ - /bin/bash -c "mkdir build && cp -r /source/. /build && - cd /build && mkdir build && cd build && + /bin/bash -c "mkdir hyperion.ng && cp -r /source/. /hyperion.ng && + cd /hyperion.ng && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. || exit 2 && make -j $(nproc) ${PACKAGES} || exit 3 && echo '---> Copy binaries and packages to host folder: ${SCRIPT_PATH}/deploy' && - cp -v /build/build/bin/h* /deploy/ 2>/dev/null || : && - cp -v /build/build/Hyperion-* /deploy/ 2>/dev/null || : && + cp -v /hyperion.ng/build/bin/h* /deploy/ 2>/dev/null || : && + cp -v /hyperion.ng/build/Hyperion.NG-* /deploy/ 2>/dev/null || : && exit 0; exit 1 " || { echo "---> Hyperion compilation failed! Abort"; exit 4; }