From 9035f00d5b4ae54e83c0ad40d2e84109af03f50c Mon Sep 17 00:00:00 2001 From: Incardona Pietro <incardon@mpi-cbg.de> Date: Mon, 6 Sep 2021 16:44:22 +0200 Subject: [PATCH] Fixing postinst script --- CMakeLists.txt | 8 +++++++- src/scripts/postinst | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54be2db42..e24e7b719 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,6 +294,12 @@ list(GET VERSION_LIST 2 OPENFPM_VERSION_PATCH) if (CPACK_RUN_INSTALL_DEPENDENCIES) + ###### Fix post inst script ###### + + + + ###### ###### + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenFPM distributed data-structures") set(CPACK_PACKAGE_VENDOR "IBirdSoft") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt") @@ -310,7 +316,7 @@ if (CPACK_RUN_INSTALL_DEPENDENCIES) set(CPACK_DEBIAN_PACKAGE_MAINTAINER Pietro Incardona) set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/scripts/postinst) set(CPACK_POSTFLIGHT_OPENFPM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/src/scripts/postflight) - set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/src/script/postinst") + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_CURRENT_SOURCE_DIR}/src/scripts/postinst) set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt") install(FILES $ENV{DEP_PACKING}/openfpm_vars diff --git a/src/scripts/postinst b/src/scripts/postinst index 763d3ed56..0bc0fe9c0 100644 --- a/src/scripts/postinst +++ b/src/scripts/postinst @@ -1,9 +1,9 @@ #! /bin/bash -/projects\/ppm\/rundeck\/openfpm_super_bundles\/$1\/openfpm_dep_$1 +echo "Fixing folders for CPACK_LINUX_VERSION" -sed -i -e 's/projects\/ppm\/rundeck\/openfpm_super_bundles\/$1\/openfpm_dep_$1/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/source/openfpm_vars -sed -i -e 's/projects\/ppm\/rundeck\/openfpm_super_bundles\/$1\/openfpm_dep_$1/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk +sed -i -e 's/projects\/ppm\/rundeck\/openfpm_super_bundles\/CPACK_LINUX_VERSION\/openfpm_dep_CPACK_LINUX_VERSION/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/source/openfpm_vars +sed -i -e 's/projects\/ppm\/rundeck\/openfpm_super_bundles\/CPACK_LINUX_VERSION\/openfpm_dep_CPACK_LINUX_VERSION/usr\/local\/openfpm\/dependencies/g' /usr/local/openfpm/openfpm_pdata/include/example.mk echo "export OPAL_PREFIX=/usr/local/openfpm/dependencies/MPI" >> /usr/local/openfpm/source/openfpm_vars -- GitLab