From 553ba0973b588465de3a6fa6d547c5ac7f2f3719 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 20 Nov 2020 23:15:19 +0100 Subject: [PATCH] build script reviewed - help text updated - remove .release-* files in ${PREFIX}/Tools/modulefile - add find(1) --- build | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/build b/build index 3725a93..79886a1 100755 --- a/build +++ b/build @@ -127,12 +127,12 @@ Options: --distfilesdir=DIR Directory where downloaded files are stored. - The default is '${DEFAULT_PMODULES_DISTFILESDIR}' in the + The default is 'PREFIX/${DEFAULT_DISTFILES_DIR}' in the Pmodules root directory. --tmpdir=DIR Directory for temporary files. - The default is '${DEFAULT_PMODULES_TMPDIR}' + The default is 'PREFIX/${DEFAULT_TMPDIR}' --help Print this help text. @@ -283,6 +283,8 @@ pmodules::compile() { "${BOOTSTRAP_DIR}/Tools/${name}/build" \ "${build_opts[@]}" "$@" "${version}" || \ std::die 3 "Compiling '${name}' failed!" + # :FIXME: this must be fixed in modbuild! + rm -f "${BOOTSTRAP_DIR}/Tools/modulefiles/.release-$V" } local prefix="${PMODULES_ROOT:-${DEFAULT_PMODULES_ROOT}}" @@ -343,6 +345,10 @@ pmodules::compile() { build bash fi + if [[ ! -f "${PMODULES_HOME}/sbin/find" ]] || [[ ${opt_force} == 'yes' ]]; then + build findutils + fi + if [[ ! -e "${PMODULES_HOME}/sbin/tclsh" ]] || [[ ${opt_force} == 'yes' ]]; then build Tcl fi @@ -531,3 +537,8 @@ done pmodules::${subcmd} "${subcmd_args[@]}" +# Local Variables: +# mode: sh +# sh-basic-offset: 8 +# tab-width: 8 +# End: