diff --git a/CMakeLists.txt b/CMakeLists.txt index 54be2db4230f2d39ea32df655a13d49881dc11cb..e24e7b719f27c4421ab4ab179aa074cca6227ea2 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 763d3ed561a4529800f9222de37392223c86c1b1..0bc0fe9c03f7006e3acf3701a819b02502f45be8 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