From a48990574c817b9bea8eecc669f20cd0a374c276 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 27 Oct 2020 09:36:17 +0100 Subject: [PATCH 01/13] Ubuntu support addded to std::get_os_release() --- Pmodules/libstd.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Pmodules/libstd.bash b/Pmodules/libstd.bash index e54f4b7..07c0b42 100644 --- a/Pmodules/libstd.bash +++ b/Pmodules/libstd.bash @@ -289,6 +289,9 @@ std.get_os_release_linux() { RedHatEnterpriseServer | RedHatEnterprise | Scientific | rhel | centos | fedora ) echo "rhel${VERSION_ID%.*}" ;; + Ubuntu ) + echo "Ubuntu${VERSION_ID%.*}" + ;; * ) echo "Unknown" exit 1 From 4b0564691329764692b2e1af7b59d028f2c165ff Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Oct 2020 17:10:38 +0100 Subject: [PATCH 02/13] help for subcommand 'configure' added to build script --- build | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/build b/build index c34dd90..0d71623 100755 --- a/build +++ b/build @@ -42,6 +42,70 @@ build [OPTIONS] configure|compile|install #----------------------------------------------------------------------------- # + +pmodules::help_help() { + echo "Usage: +$(basename $0) help help|configure|compile|install +" + std::die 1 "" +} + +pmodules::help() { + if (( $# > 1 )); then + pmodules::help_help + fi + case $1 in + help|configure|compile|install ) + pmodules::help_$1 + ;; + * ) + pmodules::help_help + ;; + esac +} + +#----------------------------------------------------------------------------- +# +pmodules::help_configure() { + echo " +Usage: $(basename $0) configure [OPTION...] + +Configure and setup a new Pmodules environment. You need permissions +to write to the installation root. + +Options: +--config=FILE + Specify a different configuration filename to create. This option + can be used if you want to install multiple Pmodules environments + on the same system. The file will actually be created as a sym- + bolic link in + '${BOOTSSTRAP_DIR}/config' + to + '\${PMODULES_ROOT}/config/modbuild.conf' + Whereby '\${PMODULES_ROOT}' is the root of the Pmodules environment. + The default is '${DEFAULT_MODBUILD_CONFIG}'. + +--pmodules-root=DIR + Root of the Pmodules environment installation. Everything will be + installed in a directory hierarchy with 'DIR' as prefix. + The default is '${DEFAULT_PMODULES_ROOT}'. + +--distfilesdir=DIR + Directory where downloaded files are stored. + The default is '${DEFAULT_PMODULES_DISTFILESDIR}' in the + Pmodules root directory. + +--tmpdir=DIR + Directory for temporary files. + The default is '${DEFAULT_PMODULES_TMPDIR}' + +--help + Print this help text. + +" 1>&2 + std::die 1 "" +} + pmodules::configure() { local install_root="${DEFAULT_PMODULES_ROOT}" local distfilesdir="${DEFAULT_PMODULES_DISTFILESDIR}" @@ -78,6 +142,9 @@ pmodules::configure() { --tmpdir=* ) tmpdir="${1#*=}" ;; + --help | -h | -\? ) + pmodules::help_configure + ;; -* ) std::die 1 "$1: illegal option" ;; @@ -98,6 +165,13 @@ pmodules::configure() { #----------------------------------------------------------------------------- # +pmodules::help_compile() { + echo "Usage: +$(basename $0) compile [OPTION...] +" + std::die 1 "" +} + pmodules::compile() { build () { local -r name="$1" @@ -188,6 +262,13 @@ pmodules::compile() { #----------------------------------------------------------------------------- # +pmodules::help_install() { + echo "Usage: +$(basename $0) install [OPTION...] +" + std::die 1 "" +} + pmodules::install() { local opt_force='no' local config_file="${BOOTSTRAP_DIR}/${DEFAULT_MODBUILD_CONFIG}" @@ -344,7 +425,7 @@ while (( $# > 0 )); do -* ) std::die 1 "$1: illegal option" ;; - configure | compile | install ) + help | configure | compile | install ) subcmd="$1" shift 1 subcmd_args=( "$@" ) From 798a8ee8247c5889244561e781911ae28e27ce6f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Oct 2020 23:57:03 +0100 Subject: [PATCH 03/13] bug in installing doc files fixed in Tcl/build --- Tools/Tcl/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/Tcl/build b/Tools/Tcl/build index 4324d56..ca7bfaf 100755 --- a/Tools/Tcl/build +++ b/Tools/Tcl/build @@ -1,7 +1,7 @@ #!/usr/bin/env modbuild pbuild::set_download_url "ftp://ftp.tcl.tk/pub/tcl/tcl8_6/tcl$V-src.tar.gz" -pbuild::install_docfiles 'license.terms' 'README*' +pbuild::install_docfiles 'license.terms' 'README.md' pbuild::configure() { case ${OS} in From e230fbce3aaa9d7e1eabf9673be814bb9b7f68c8 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 29 Oct 2020 23:57:26 +0100 Subject: [PATCH 04/13] review of build script --- build | 106 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 82 insertions(+), 24 deletions(-) diff --git a/build b/build index c34dd90..562aa61 100755 --- a/build +++ b/build @@ -13,14 +13,15 @@ unset PMODULES_ROOT unset PMODULES_HOME unset PMODULES_DISTFILESDIR +declare -rx CONFIG_DIR='config' +declare -rx CONFIG_FILE='modbuild.conf' + # defaults declare -rx DEFAULT_PMODULES_ROOT='/opt/psi' declare -rx DEFAULT_PMODULES_DISTFILESDIR="${DEFAULT_PMODULES_ROOT}/var/distfiles" -declare -rx DEFAULT_MODBUILD_CONFIG='config/modbuild.conf' -declare -rx DEFAULT_VERSIONS_CONFIG='config/versions.conf' +declare -rx DEFAULT_VERSIONS_CONFIG="${CONFIG_DIR}/versions.conf" declare -rx DEFAULT_PMODULES_TMPDIR='/var/tmp/${USER}' - #----------------------------------------------------------------------------- # get_version() { @@ -43,10 +44,11 @@ build [OPTIONS] configure|compile|install #----------------------------------------------------------------------------- # pmodules::configure() { - local install_root="${DEFAULT_PMODULES_ROOT}" + local pmodules_root="${DEFAULT_PMODULES_ROOT}" local distfilesdir="${DEFAULT_PMODULES_DISTFILESDIR}" local tmpdir="${DEFAULT_PMODULES_TMPDIR}" - local config_file="${BOOTSTRAP_DIR}/${DEFAULT_MODBUILD_CONFIG}" + local config_file='' + local opt_force='no' while (( $# > 0 )); do case "$1" in @@ -57,12 +59,12 @@ pmodules::configure() { --config=* ) config_file="${1#*=}" ;; - --install-root ) - install_root="$2" + --pmodules-root ) + pmodules_root="$2" shift 1 ;; - --install-root=* ) - install_root="${1#*=}" + --pmodules-root=* ) + pmodules_root="${1#*=}" ;; --distfilesdir ) distfilesdir="$2" @@ -71,6 +73,9 @@ pmodules::configure() { --distfilesdir=* ) distfilesdir="${1#*=}" ;; + -f | --force ) + opt_force='yes' + ;; --tmpdir ) tmpdir="$2" shift 1 @@ -87,13 +92,52 @@ pmodules::configure() { esac shift 1 done + if [[ -n "${config_file}" ]]; then + config_file=$(std::abspath "${config_file}") + if [[ $(dirname "${config_file}" != "${BOOTSTRAP_DIR}/${CONFIG_DIR}" ]]; then + echo "Invalid directory for The configuration file." 1>&2 + std::die 1 "The configuration file must be in '${BOOTSTRAP_DIR}/${CONFIG_DIR}'!" + fi + else + config_file="${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}" + fi + if [[ ! -d ${pmodules_root} ]]; then + echo "The root directory '${pmodules_root}' does not exist, trying to create it..." + if ! mkdir -p "${pmodules_root}"; then + std::die 1 "Creating the root directory failed!\nAborting..." + fi + fi + if [[ ! -w ${pmodules_root} ]]; then + std::die 1 "The root directory '${pmodules_root}' is not writable!\nAborting..." + fi + mkdir -p "${pmodules_root}/${CONFIG_DIR}" || \ + std::die 1 "Aborting..." - sed_cmd="s:@PMODULES_ROOT@:${install_root}:g;" + if [[ "${opt_force}" == 'yes' ]]; then + rm -f "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${config_file}" + fi + + if [[ -L ${BOOTSTRAP_DIR}/${CONFIG_DIR}/${config_file} ]]; then + std::die 1 "The Pmodules environment has already been configured! +Use the option --force to override.\nAborting..." + fi + sed_cmd="s:@PMODULES_ROOT@:${pmodules_root}:g;" sed_cmd+="s:@PMODULES_DISTFILESDIR@:${distfilesdir}:g;" sed_cmd+="s:@PMODULES_TMPDIR@:${tmpdir}:g;" sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g" - sed "${sed_cmd}" "${DEFAULT_MODBUILD_CONFIG}.in" > "${config_file}" + sed "${sed_cmd}" "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}.in" \ + > "${pmodules_root}/${CONFIG_DIR}/${CONFIG_FILE}" || \ + std::die 1 "Cannot create configuration file in Pmodules root\nAborting..." + ln -s "${pmodules_root}/${CONFIG_DIR}/${CONFIG_FILE}" \ + "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${config_file}" + + install -d -m 0755 "${PMODULES_HOME}/bin" + install -d -m 0755 "${PMODULES_HOME}/config" + install -d -m 0755 "${PMODULES_HOME}/init" + install -d -m 0755 "${PMODULES_HOME}/lib" + install -d -m 0755 "${PMODULES_HOME}/libexec" + install -d -m 0755 "${PMODULES_HOME}/sbin" } #----------------------------------------------------------------------------- @@ -105,7 +149,6 @@ pmodules::compile() { shift "${BOOTSTRAP_DIR}/Pmodules/modbuild" \ - "--debug" \ "--config=${config_file}" \ "--enable-cleanup" \ "--force-rebuild" \ @@ -115,7 +158,7 @@ pmodules::compile() { } local force='no' - local config_file="${BOOTSTRAP_DIR}/${DEFAULT_MODBUILD_CONFIG}" + local config_file='' while (( $# > 0 )); do case $1 in @@ -132,11 +175,11 @@ pmodules::compile() { --config=* ) config_file=$(std::get_abspath "${1#*=}") ;; - --install-root ) + --pmodules-root ) PMODULES_ROOT="$2" shift 1 ;; - --install-root=* ) + --pmodules-root=* ) PMODULES_ROOT="${1#*=}" ;; -f | --force ) @@ -152,13 +195,28 @@ pmodules::compile() { shift 1 done - source "${config_file}" - install -d -m 0755 "${PMODULES_HOME}/bin" - install -d -m 0755 "${PMODULES_HOME}/config" - install -d -m 0755 "${PMODULES_HOME}/init" - install -d -m 0755 "${PMODULES_HOME}/lib" - install -d -m 0755 "${PMODULES_HOME}/libexec" - install -d -m 0755 "${PMODULES_HOME}/sbin" + if [[ -n "${config_file}" ]] && [[ -n "${PMODULES_ROOT}" ]]; then + std::die 1 "You cannot use the options '--config' and '--pmodules-root at the same time!" + fi + if [[ -n "${PMODULES_ROOT}" ]]; then + config_file="${PMODULES_ROOT}/${CONFIG_DIR}/${CONFIG_FILE}" + elif [[ -z "${config_file}" ]]; then + config_file="${BOOTSTRAP_DIR}/${CONFIG_DIR}/$(basename ${config_file})" + fi + if [[ ! -r "${config_file}" ]]; then + std::die 1 "Configuration file '${config_file}' does not exist or is not readable!" + fi + source "${config_file}" || std::die 1 "Cannot read configuration file '${config_file}'" + + if [[ -z "${PMODULES_ROOT}" ]]; then + std::die 1 "Error in configuration file '${config_file}': PMODULE_ROOT not defined!" + fi + if [[ -z "${PMODULES_DISTFILESDIR}" ]]; then + std::die 1 "Error in configuration file '${config_file}': PMODULES_DISTFILESDIR not defined!" + fi + if [[ -z "${PMODULES_TMPDIR}" ]]; then + std::die 1 "Error in configuration file '${config_file}': PMODULE_TMPDIR not defined!" + fi if [[ ! -f "${PMODULES_HOME}/sbin/base64" ]] || [[ ${force} == 'yes' ]]; then build coreutils @@ -207,11 +265,11 @@ pmodules::install() { --debug ) set -x ;; - --install-root ) + --pmodules-root ) PMODULES_ROOT="$2" shift 1 ;; - --install-root=* ) + --pmodules-root=* ) PMODULES_ROOT="${1#*=}" ;; -f | --force ) From f3921e3014c98d3854168319c3221de6eb23298d Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 30 Oct 2020 18:08:12 +0100 Subject: [PATCH 05/13] libstd.bash: get_abspath(): do not test whether the file is readable --- Pmodules/libstd.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pmodules/libstd.bash b/Pmodules/libstd.bash index 07c0b42..a2db280 100644 --- a/Pmodules/libstd.bash +++ b/Pmodules/libstd.bash @@ -57,7 +57,7 @@ std::get_YN_answer() { # $1: filename std::get_abspath() { local -r fname=$1 - [[ -r "${fname}" ]] || return 1 + #[[ -r "${fname}" ]] || return 1 if [[ -d ${fname} ]]; then echo $(cd "${fname}" && pwd) else From ac5f257cbb2482b0e76bb743445a2afbb307e789 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 30 Oct 2020 18:09:10 +0100 Subject: [PATCH 06/13] profile.csh.in: hardcoded root directory fixed --- Pmodules/profile.csh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pmodules/profile.csh.in b/Pmodules/profile.csh.in index c4e4f78..0047bdb 100755 --- a/Pmodules/profile.csh.in +++ b/Pmodules/profile.csh.in @@ -16,7 +16,7 @@ endif setenv PMODULES_MODULEFILES_DIR 'modulefiles' setenv PMODULES_DEFINED_RELEASES ':unstable:stable:deprecated:' -setenv PMODULES_ROOT '/opt/psi' +setenv PMODULES_ROOT "@PMODULES_ROOT@" setenv PMODULES_CONFIG_DIR 'config' setenv PMODULES_HOME "${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}" setenv PMODULES_DIR "${PMODULES_HOME}" From c45982a67f906ec1c84a94213ca1819ab175809f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 30 Oct 2020 18:10:20 +0100 Subject: [PATCH 07/13] modulebuild.conf.in: OS specific config removed --- config/modbuild.conf.in | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/config/modbuild.conf.in b/config/modbuild.conf.in index b1e6090..60d33c3 100644 --- a/config/modbuild.conf.in +++ b/config/modbuild.conf.in @@ -1,12 +1,11 @@ #!/bin/bash - -# -# define PMODULES_ROOT only if it has not been passed as argument -# to build/install scripts # : ${PMODULES_ROOT:=@PMODULES_ROOT@} : ${PMODULES_DISTFILESDIR:=@PMODULES_DISTFILESDIR@} : ${PMODULES_TMPDIR:=@PMODULES_TMPDIR@} +export PMODULES_ROOT +export PMODULES_DISTFILESDIR +export PMODULES_TMPDIR declare -x PMODULES_CONFIG_DIR='config' declare -x PMODULES_MODULEFILES_DIR='modulefiles' @@ -17,16 +16,3 @@ declare -x PMODULES_DEFAULT_GROUPS='Tools Programming' declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:' declare -x PMODULES_DEFAULT_RELEASES='stable' -export PMODULES_DISTFILESDIR -export PMODULES_TMPDIR - -#----------------------------------------------------------------------------- -# OS specific configuration -# -case ${OS} in -Darwin ) - declare -x MACOSX_DEPLOYMENT_TARGET='10.12' - #declare -rx SDKROOT='macosx10.9' - ;; -esac - From 5183f477d97991cf6aefc2717721d507f75a2388 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 30 Oct 2020 18:11:11 +0100 Subject: [PATCH 08/13] more changes to build script --- build | 222 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 120 insertions(+), 102 deletions(-) diff --git a/build b/build index 562aa61..7bd87cc 100755 --- a/build +++ b/build @@ -1,4 +1,9 @@ -#!/bin/bash +#!/usr/bin/env bash +# +if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then + echo "BASH version >= 4 is required and must be available in PATH!" 1>&2 + exit 1 +fi declare BOOTSTRAP_DIR=$(dirname "$0") source "${BOOTSTRAP_DIR}/Pmodules/libstd.bash" || { echo "Oops!" 1>&2; exit 42; } @@ -6,21 +11,20 @@ source "${BOOTSTRAP_DIR}/Pmodules/libstd.bash" || { echo "Oops!" 1>&2; exit 42; declare -r BOOTSTRAP_DIR=$(std::get_abspath "${BOOTSTRAP_DIR}") declare -r SRC_DIR="${BOOTSTRAP_DIR}/Pmodules" -# not used here -unset PMODULES_ROOT - -# these variables are re-declared and set in the configuration file -unset PMODULES_HOME -unset PMODULES_DISTFILESDIR +# these variables need to be defined but must be initialized with an empty string +declare -x PMODULES_ROOT='' +PMODULES_HOME='' +declare -x PMODULES_DISTFILESDIR='' +declare -x PMODULES_TMPDIR='' declare -rx CONFIG_DIR='config' declare -rx CONFIG_FILE='modbuild.conf' # defaults declare -rx DEFAULT_PMODULES_ROOT='/opt/psi' -declare -rx DEFAULT_PMODULES_DISTFILESDIR="${DEFAULT_PMODULES_ROOT}/var/distfiles" +declare -rx DEFAULT_DISTFILES_DIR="var/distfiles" declare -rx DEFAULT_VERSIONS_CONFIG="${CONFIG_DIR}/versions.conf" -declare -rx DEFAULT_PMODULES_TMPDIR='/var/tmp/${USER}' +declare -rx DEFAULT_TMPDIR='var/tmp/${USER}' #----------------------------------------------------------------------------- # @@ -41,12 +45,55 @@ build [OPTIONS] configure|compile|install std::die 1 "" } +#----------------------------------------------------------------------------- +# +read_config_file() { + local var="$1" + local fname="${!var}" + if [[ -n "${fname}" ]] && [[ -n "${PMODULES_ROOT}" ]]; then + std::die 1 "You cannot use the options '--config' and '--pmodules-root at the same time!" + fi + if [[ -n "${PMODULES_ROOT}" ]]; then + fname="${PMODULES_ROOT}/${CONFIG_DIR}/${CONFIG_FILE}" + elif [[ -n "${fname}" ]]; then + : + else + fname="${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}" + fi + if [[ ! -r "${fname}" ]]; then + std::die 1 "Configuration file '${fname}' does not exist or is not readable!" + fi + + source "${fname}" || std::die 1 "Cannot read configuration file '${fname}'" + + # we have to make these variables global, otherwise they are not set + # in the calling function + declare -g PMODULES_ROOT="${PMODULES_ROOT}" + declare -g PMODULES_HOME="${PMODULES_HOME}" + declare -g PMODULES_DISTFILESDIR="${PMODULES_DISTFILESDIR}" + declare -g PMODULES_TMPDIR="${PMODULES_TMPDIR}" + + if [[ -z "${PMODULES_ROOT}" ]]; then + std::die 1 "Error in configuration file '${fname}': PMODULE_ROOT not defined!" + fi + if [[ -z "${PMODULES_VERSION}" ]]; then + std::die 1 "Error in configuration file '${fname}': PMODULE_VERSION not defined!" + fi + if [[ -z "${PMODULES_DISTFILESDIR}" ]]; then + std::die 1 "Error in configuration file '${fname}': PMODULES_DISTFILESDIR not defined!" + fi + if [[ -z "${PMODULES_TMPDIR}" ]]; then + std::die 1 "Error in configuration file '${fname}': PMODULE_TMPDIR not defined!" + fi + std::upvar "${var}" "${fname}" +} + #----------------------------------------------------------------------------- # pmodules::configure() { local pmodules_root="${DEFAULT_PMODULES_ROOT}" - local distfilesdir="${DEFAULT_PMODULES_DISTFILESDIR}" - local tmpdir="${DEFAULT_PMODULES_TMPDIR}" + local distfilesdir='' + local tmpdir='' local config_file='' local opt_force='no' @@ -92,9 +139,9 @@ pmodules::configure() { esac shift 1 done - if [[ -n "${config_file}" ]]; then - config_file=$(std::abspath "${config_file}") - if [[ $(dirname "${config_file}" != "${BOOTSTRAP_DIR}/${CONFIG_DIR}" ]]; then + if [[ -n "${config_file}" ]]; then + config_file=$(std::get_abspath "${config_file}") + if [[ $(dirname "${config_file}") != "${BOOTSTRAP_DIR}/${CONFIG_DIR}" ]]; then echo "Invalid directory for The configuration file." 1>&2 std::die 1 "The configuration file must be in '${BOOTSTRAP_DIR}/${CONFIG_DIR}'!" fi @@ -114,13 +161,17 @@ pmodules::configure() { std::die 1 "Aborting..." if [[ "${opt_force}" == 'yes' ]]; then - rm -f "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${config_file}" + rm -f "${config_file}" fi - if [[ -L ${BOOTSTRAP_DIR}/${CONFIG_DIR}/${config_file} ]]; then + if [[ -L "${config_file}" ]]; then std::die 1 "The Pmodules environment has already been configured! Use the option --force to override.\nAborting..." fi + + [[ -z "${distfilesdir}" ]] && distfilesdir="${pmodules_root}/${DEFAULT_DISTFILES_DIR}" + [[ -z "${tmpdir}" ]] && tmpdir="${pmodules_root}/${DEFAULT_TMPDIR}" + sed_cmd="s:@PMODULES_ROOT@:${pmodules_root}:g;" sed_cmd+="s:@PMODULES_DISTFILESDIR@:${distfilesdir}:g;" sed_cmd+="s:@PMODULES_TMPDIR@:${tmpdir}:g;" @@ -130,14 +181,22 @@ Use the option --force to override.\nAborting..." > "${pmodules_root}/${CONFIG_DIR}/${CONFIG_FILE}" || \ std::die 1 "Cannot create configuration file in Pmodules root\nAborting..." ln -s "${pmodules_root}/${CONFIG_DIR}/${CONFIG_FILE}" \ - "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${config_file}" + "${config_file}" || \ + std::die 1 "Aborting..." + read_config_file 'config_file' install -d -m 0755 "${PMODULES_HOME}/bin" install -d -m 0755 "${PMODULES_HOME}/config" install -d -m 0755 "${PMODULES_HOME}/init" install -d -m 0755 "${PMODULES_HOME}/lib" install -d -m 0755 "${PMODULES_HOME}/libexec" install -d -m 0755 "${PMODULES_HOME}/sbin" + echo "Configuration:" + echo " root of Pmodules environment: ${pmodules_root}" + echo " Pmodule prefix: ${PMODULES_HOME}" + echo " tmp directory: ${tmpdir}" + echo " store for downloaded files: ${distfilesdir}" + echo "Done..." } #----------------------------------------------------------------------------- @@ -157,7 +216,7 @@ pmodules::compile() { std::die 3 "Compiling '${name}' failed!" } - local force='no' + local opt_force='no' local config_file='' while (( $# > 0 )); do @@ -183,7 +242,7 @@ pmodules::compile() { PMODULES_ROOT="${1#*=}" ;; -f | --force ) - force='yes' + opt_force='yes' ;; -* ) std::die 1 "$1: illegal option" @@ -195,50 +254,33 @@ pmodules::compile() { shift 1 done - if [[ -n "${config_file}" ]] && [[ -n "${PMODULES_ROOT}" ]]; then - std::die 1 "You cannot use the options '--config' and '--pmodules-root at the same time!" - fi - if [[ -n "${PMODULES_ROOT}" ]]; then - config_file="${PMODULES_ROOT}/${CONFIG_DIR}/${CONFIG_FILE}" - elif [[ -z "${config_file}" ]]; then - config_file="${BOOTSTRAP_DIR}/${CONFIG_DIR}/$(basename ${config_file})" - fi - if [[ ! -r "${config_file}" ]]; then - std::die 1 "Configuration file '${config_file}' does not exist or is not readable!" - fi - source "${config_file}" || std::die 1 "Cannot read configuration file '${config_file}'" + echo "Configuration:" + echo " root of Pmodules environment: ${pmodules_root}" + echo " Pmodule prefix: ${PMODULES_HOME}" - if [[ -z "${PMODULES_ROOT}" ]]; then - std::die 1 "Error in configuration file '${config_file}': PMODULE_ROOT not defined!" - fi - if [[ -z "${PMODULES_DISTFILESDIR}" ]]; then - std::die 1 "Error in configuration file '${config_file}': PMODULES_DISTFILESDIR not defined!" - fi - if [[ -z "${PMODULES_TMPDIR}" ]]; then - std::die 1 "Error in configuration file '${config_file}': PMODULE_TMPDIR not defined!" - fi + read_config_file config_file - if [[ ! -f "${PMODULES_HOME}/sbin/base64" ]] || [[ ${force} == 'yes' ]]; then + if [[ ! -f "${PMODULES_HOME}/sbin/base64" ]] || [[ ${opt_force} == 'yes' ]]; then build coreutils fi - if [[ ! -f "${PMODULES_HOME}/sbin/xgettext" ]] || [[ ${force} == 'yes' ]]; then + if [[ ! -f "${PMODULES_HOME}/sbin/xgettext" ]] || [[ ${opt_force} == 'yes' ]]; then build gettext fi - if [[ ! -f "${PMODULES_HOME}/sbin/getopt" ]] || [[ ${force} == 'yes' ]]; then + if [[ ! -f "${PMODULES_HOME}/sbin/getopt" ]] || [[ ${opt_force} == 'yes' ]]; then build getopt fi - if [[ ! -f "${PMODULES_HOME}/sbin/bash" ]] || [[ ${force} == 'yes' ]]; then + if [[ ! -f "${PMODULES_HOME}/sbin/bash" ]] || [[ ${opt_force} == 'yes' ]]; then build bash fi - if [[ ! -e "${PMODULES_HOME}/sbin/tclsh" ]] || [[ ${force} == 'yes' ]]; then + if [[ ! -e "${PMODULES_HOME}/sbin/tclsh" ]] || [[ ${opt_force} == 'yes' ]]; then build Tcl fi - if [[ ! -e "${PMODULES_HOME}/libexec/modulecmd.bin" ]] || [[ ${force} == 'yes' ]]; then + if [[ ! -e "${PMODULES_HOME}/libexec/modulecmd.bin" ]] || [[ ${opt_force} == 'yes' ]]; then build modules fi echo "Done..." @@ -247,8 +289,8 @@ pmodules::compile() { #----------------------------------------------------------------------------- # pmodules::install() { + local config_file='' local opt_force='no' - local config_file="${BOOTSTRAP_DIR}/${DEFAULT_MODBUILD_CONFIG}" while (( $# > 0 )); do case $1 in @@ -285,26 +327,15 @@ pmodules::install() { shift 1 done - source "${config_file}" - - if [[ ! -d "${PMODULES_ROOT}" ]]; then - read -p "The requested root directory does not exist. Create it? [y|N] " -n 1 ans - case ${ans} in - y | Y ) - mkdir -p "${PMODULES_ROOT}" - ;; - * ) - echo "Aborting ..." 1>&2 - exit 2 - ;; - esac - fi + read_config_file 'config_file' ### # # begin installation # - echo "Installing to ${PMODULES_HOME} ..." + echo "Configuration:" + echo " root of Pmodules environment: ${PMODULES_ROOT}" + echo " Pmodule prefix: ${PMODULES_HOME}" sed_cmd="s:@PMODULES_HOME@:${PMODULES_HOME}:g;" sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g;" sed_cmd+="s:@MODULES_VERSION@:${MODULES_VERSION}:g;" @@ -319,50 +350,31 @@ pmodules::install() { sed_cmd+="s:@initdir@:${PMODULES_HOME}/init:g;" sed_cmd+="s:@MODULES_RELEASE@:${PMODULES_VERSION}:g;" - sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" > "${SRC_DIR}/modulecmd.bash" - sed "${sed_cmd}" "${SRC_DIR}/modulecmd.tcl.in" > "${SRC_DIR}/modulecmd.tcl" - sed "${sed_cmd}" "${SRC_DIR}/modbuild.in" > "${SRC_DIR}/modbuild" - chmod 0755 "${SRC_DIR}/modbuild" - sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in" > "${SRC_DIR}/modmanage.bash" - sed "${sed_cmd}" "${SRC_DIR}/profile.bash.in" > "${SRC_DIR}/profile.bash" - sed "${sed_cmd}" "${SRC_DIR}/profile.csh.in" > "${SRC_DIR}/profile.csh" - sed "${sed_cmd}" "${SRC_DIR}/profile.zsh.in" > "${SRC_DIR}/profile.zsh" + sed "${sed_cmd}" "${SRC_DIR}/profile.bash.in" > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.bash-${PMODULES_VERSION}" + sed "${sed_cmd}" "${SRC_DIR}/profile.csh.in" > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.csh-${PMODULES_VERSION}" + sed "${sed_cmd}" "${SRC_DIR}/profile.zsh.in" > "${PMODULES_ROOT}/${CONFIG_DIR}/profile.zsh-${PMODULES_VERSION}" + chmod 0644 "${PMODULES_ROOT}/${CONFIG_DIR}"/*-${PMODULES_VERSION} - install -d -m 0755 "${PMODULES_HOME}/bin" - install -d -m 0755 "${PMODULES_HOME}/config" - install -d -m 0755 "${PMODULES_HOME}/init" - install -d -m 0755 "${PMODULES_HOME}/lib" - install -d -m 0755 "${PMODULES_HOME}/libexec" - install -d -m 0755 "${PMODULES_HOME}/sbin" + test -e "${PMODULES_ROOT}/${CONFIG_DIR}/profile.bash" || \ + install -m 0644 "$_-${PMODULES_VERSION}" "$_" + + test -e "${PMODULES_ROOT}/${CONFIG_DIR}/profile.csh" || \ + install -m 0644 "$_-${PMODULES_VERSION}" "$_" + + test -e "${PMODULES_ROOT}/${CONFIG_DIR}/profile.zsh" || \ + install -m 0644 "$_-${PMODULES_VERSION}" "$_" + + sed "${sed_cmd}" "${SRC_DIR}/modulecmd.bash.in" > "${PMODULES_HOME}/libexec/modulecmd.bash" + chmod 0755 "${PMODULES_HOME}/libexec/modulecmd.bash" + sed "${sed_cmd}" "${SRC_DIR}/modulecmd.tcl.in" > "${PMODULES_HOME}/libexec/modulecmd.tcl" + chmod 0755 "${PMODULES_HOME}/libexec/modulecmd.tcl" + sed "${sed_cmd}" "${SRC_DIR}/modbuild.in" > "${PMODULES_HOME}/bin/modbuild" + chmod 0755 "${PMODULES_HOME}/bin/modbuild" + sed "${sed_cmd}" "${SRC_DIR}/modmanage.bash.in" > "${PMODULES_HOME}/libexec/modmanage.bash" + chmod 0755 "${PMODULES_HOME}/libexec/modmanage.bash" install -m 0755 "${SRC_DIR}/modulecmd" "${PMODULES_HOME}/bin" - install -m 0755 "${SRC_DIR}/modulecmd.bash" "${PMODULES_HOME}/libexec" - install -m 0755 "${SRC_DIR}/modulecmd.tcl" "${PMODULES_HOME}/libexec" install -m 0755 "${SRC_DIR}/modmanage" "${PMODULES_HOME}/bin" - install -m 0755 "${SRC_DIR}/modmanage.bash" "${PMODULES_HOME}/libexec" - install -m 0755 "${SRC_DIR}/modbuild" "${PMODULES_HOME}/bin" - - install -m 0755 "${SRC_DIR}/profile.bash" "${PMODULES_HOME}/config/profile.bash.sample" - install -m 0755 "${SRC_DIR}/profile.csh" "${PMODULES_HOME}/config/profile.csh.sample" - install -m 0755 "${SRC_DIR}/profile.zsh" "${PMODULES_HOME}/config/profile.zsh.sample" - - test -e "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}" || mkdir -p "$_" - - test -e "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/profile.bash" || \ - install -m 0755 "${SRC_DIR}/profile.bash" "$_" - - test -e "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/profile.csh" || \ - install -m 0755 "${SRC_DIR}/profile.csh" "$_" - - test -e "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/profile.zsh" || \ - install -m 0755 "${SRC_DIR}/profile.zsh" "$_" - - test -e "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/modbuild.conf" || \ - install -m 0755 "${config_file}" "$_" - - mkdir -p "${PMODULES_ROOT}/Tools/modulefiles" - mkdir -p "${PMODULES_ROOT}/Libraries/modulefiles" - test -e "${PMODULES_DISTFILESDIR}" || mkdir -p "$_" install -m 0644 "${SRC_DIR}/bash" "${PMODULES_HOME}/init" install -m 0644 "${SRC_DIR}/bash_completion" "${PMODULES_HOME}/init" @@ -377,9 +389,15 @@ pmodules::install() { install -m 0644 "${SRC_DIR}/libmodules.tcl" "${PMODULES_HOME}/lib/Pmodules" { + PATH="${PMODULES_HOME}/sbin:${PATH}" cd "${PMODULES_HOME}/lib/Pmodules" "${BOOTSTRAP_DIR}/mkindex.tcl" } + + mkdir -p "${PMODULES_ROOT}/Tools/modulefiles" + mkdir -p "${PMODULES_ROOT}/Libraries/modulefiles" + + echo "Done..." } #============================================================================= From 8d4ee48918eb819e53e219bdb7ca1aff439b0a9b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Sun, 1 Nov 2020 11:36:07 +0100 Subject: [PATCH 09/13] help added, review --- build | 257 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 130 insertions(+), 127 deletions(-) diff --git a/build b/build index 956fdf6..84c9da1 100755 --- a/build +++ b/build @@ -12,8 +12,7 @@ declare -r BOOTSTRAP_DIR=$(std::get_abspath "${BOOTSTRAP_DIR}") declare -r SRC_DIR="${BOOTSTRAP_DIR}/Pmodules" # these variables need to be defined but must be initialized with an empty string -declare -x PMODULES_ROOT='' -PMODULES_HOME='' +declare -x PMODULES_HOME='' declare -x PMODULES_DISTFILESDIR='' declare -x PMODULES_TMPDIR='' @@ -35,21 +34,27 @@ get_version() { declare -rx PMODULES_VERSION=$(get_version 'Pmodules') - #----------------------------------------------------------------------------- # usage() { + local prog=$(basename $0) echo " -build [OPTIONS] configure|compile|install -" - std::die 1 "" -} +Usage: ${prog} help|configure|compile|install -#----------------------------------------------------------------------------- -# -pmodules::help_help() { - echo "Usage: -$(basename $0) help help|configure|compile|install +This script must be used to +- Bootstrap/configure a new Pmodules environment, +- compile and install the required tools +- install a new Pmodules version + +Run + + ${prog} help configure|compile|install + +or + + ${prog} configure|compile|install --help + +to get help for a specific sub-command. " std::die 1 "" } @@ -57,15 +62,16 @@ $(basename $0) help help|configure|compile|install #----------------------------------------------------------------------------- # pmodules::help() { - if (( $# > 1 )); then - pmodules::help_help + if (( $# > 1 )); then + usage fi case $1 in - help|configure|compile|install ) + configure|compile|install ) pmodules::help_$1 ;; * ) - pmodules::help_help + echo -en "$1 - invalid sub-command!\n" 1>&2 + usage ;; esac } @@ -75,29 +81,12 @@ pmodules::help() { read_config_file() { local var="$1" local fname="${!var}" - if [[ -n "${fname}" ]] && [[ -n "${PMODULES_ROOT}" ]]; then - std::die 1 "You cannot use the options '--config' and '--pmodules-root at the same time!" - fi - if [[ -n "${PMODULES_ROOT}" ]]; then - fname="${PMODULES_ROOT}/${CONFIG_DIR}/${CONFIG_FILE}" - elif [[ -n "${fname}" ]]; then - : - else - fname="${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}" - fi if [[ ! -r "${fname}" ]]; then std::die 1 "Configuration file '${fname}' does not exist or is not readable!" fi source "${fname}" || std::die 1 "Cannot read configuration file '${fname}'" - # we have to make these variables global, otherwise they are not set - # in the calling function - declare -g PMODULES_ROOT="${PMODULES_ROOT}" - declare -g PMODULES_HOME="${PMODULES_HOME}" - declare -g PMODULES_DISTFILESDIR="${PMODULES_DISTFILESDIR}" - declare -g PMODULES_TMPDIR="${PMODULES_TMPDIR}" - if [[ -z "${PMODULES_ROOT}" ]]; then std::die 1 "Error in configuration file '${fname}': PMODULE_ROOT not defined!" fi @@ -110,6 +99,14 @@ read_config_file() { if [[ -z "${PMODULES_TMPDIR}" ]]; then std::die 1 "Error in configuration file '${fname}': PMODULE_TMPDIR not defined!" fi + + # we have to make these variables global, otherwise they are not set + # in the calling function + declare -g PMODULES_ROOT="${PMODULES_ROOT}" + declare -g PMODULES_HOME="${PMODULES_HOME}" + declare -g PMODULES_DISTFILESDIR="${PMODULES_DISTFILESDIR}" + declare -g PMODULES_TMPDIR="${PMODULES_TMPDIR}" + std::upvar "${var}" "${fname}" } @@ -123,18 +120,7 @@ Configure and setup a new Pmodules environment. You need permissions to write to the installation root. Options: ---config=FILE - Specify a different configuration filename to create. This option - can be used if you want to install multiple Pmodules environments - on the same system. The file will actually be created as a sym- - bolic link in - '${BOOTSSTRAP_DIR}/config' - to - '\${PMODULES_ROOT}/config/modbuild.conf' - Whereby '\${PMODULES_ROOT}' is the root of the Pmodules environment. - The default is '${DEFAULT_MODBUILD_CONFIG}'. - ---pmodules-root=DIR +--prefix=DIR Root of the Pmodules environment installation. Everything will be installed in a directory hierarchy with 'DIR' as prefix. The default is '${DEFAULT_PMODULES_ROOT}'. @@ -158,7 +144,7 @@ Options: #----------------------------------------------------------------------------- # pmodules::configure() { - local pmodules_root="${DEFAULT_PMODULES_ROOT}" + local prefix="${PMODULES_ROOT:-${DEFAULT_PMODULES_ROOT}}" local distfilesdir='' local tmpdir='' local config_file='' @@ -166,19 +152,12 @@ pmodules::configure() { while (( $# > 0 )); do case "$1" in - --config ) - config_file="$2" + --prefix ) + prefix="$2" shift 1 ;; - --config=* ) - config_file="${1#*=}" - ;; - --pmodules-root ) - pmodules_root="$2" - shift 1 - ;; - --pmodules-root=* ) - pmodules_root="${1#*=}" + --prefix=* ) + prefix="${1#*=}" ;; --distfilesdir ) distfilesdir="$2" @@ -209,50 +188,39 @@ pmodules::configure() { esac shift 1 done - if [[ -n "${config_file}" ]]; then - config_file=$(std::get_abspath "${config_file}") - if [[ $(dirname "${config_file}") != "${BOOTSTRAP_DIR}/${CONFIG_DIR}" ]]; then - echo "Invalid directory for The configuration file." 1>&2 - std::die 1 "The configuration file must be in '${BOOTSTRAP_DIR}/${CONFIG_DIR}'!" - fi - else - config_file="${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}" - fi - if [[ ! -d ${pmodules_root} ]]; then - echo "The root directory '${pmodules_root}' does not exist, trying to create it..." - if ! mkdir -p "${pmodules_root}"; then + if [[ ! -d ${prefix} ]]; then + echo "The root directory '${prefix}' does not exist, trying to create it..." + if ! mkdir -p "${prefix}"; then std::die 1 "Creating the root directory failed!\nAborting..." fi fi - if [[ ! -w ${pmodules_root} ]]; then - std::die 1 "The root directory '${pmodules_root}' is not writable!\nAborting..." + if [[ ! -w ${prefix} ]]; then + std::die 1 "The root directory '${prefix}' is not writable!\nAborting..." fi - mkdir -p "${pmodules_root}/${CONFIG_DIR}" || \ + mkdir -p "${prefix}/${CONFIG_DIR}" || \ std::die 1 "Aborting..." + local config_file="${prefix}/${CONFIG_DIR}/${CONFIG_FILE}" if [[ "${opt_force}" == 'yes' ]]; then rm -f "${config_file}" fi - if [[ -L "${config_file}" ]]; then + if [[ -e "${config_file}" ]]; then std::die 1 "The Pmodules environment has already been configured! Use the option --force to override.\nAborting..." fi - [[ -z "${distfilesdir}" ]] && distfilesdir="${pmodules_root}/${DEFAULT_DISTFILES_DIR}" - [[ -z "${tmpdir}" ]] && tmpdir="${pmodules_root}/${DEFAULT_TMPDIR}" + [[ -z "${distfilesdir}" ]] && distfilesdir="${prefix}/${DEFAULT_DISTFILES_DIR}" + [[ -z "${tmpdir}" ]] && tmpdir="${prefix}/${DEFAULT_TMPDIR}" - sed_cmd="s:@PMODULES_ROOT@:${pmodules_root}:g;" + sed_cmd="s:@PMODULES_ROOT@:${prefix}:g;" sed_cmd+="s:@PMODULES_DISTFILESDIR@:${distfilesdir}:g;" sed_cmd+="s:@PMODULES_TMPDIR@:${tmpdir}:g;" sed_cmd+="s:@PMODULES_VERSION@:${PMODULES_VERSION}:g" sed "${sed_cmd}" "${BOOTSTRAP_DIR}/${CONFIG_DIR}/${CONFIG_FILE}.in" \ - > "${pmodules_root}/${CONFIG_DIR}/${CONFIG_FILE}" || \ + > "${config_file}" || \ std::die 1 "Cannot create configuration file in Pmodules root\nAborting..." - ln -s "${pmodules_root}/${CONFIG_DIR}/${CONFIG_FILE}" \ - "${config_file}" || \ - std::die 1 "Aborting..." read_config_file 'config_file' install -d -m 0755 "${PMODULES_HOME}/bin" @@ -262,7 +230,7 @@ Use the option --force to override.\nAborting..." install -d -m 0755 "${PMODULES_HOME}/libexec" install -d -m 0755 "${PMODULES_HOME}/sbin" echo "Configuration:" - echo " root of Pmodules environment: ${pmodules_root}" + echo " root of Pmodules environment: ${prefix}" echo " Pmodule prefix: ${PMODULES_HOME}" echo " tmp directory: ${tmpdir}" echo " store for downloaded files: ${distfilesdir}" @@ -272,9 +240,33 @@ Use the option --force to override.\nAborting..." #----------------------------------------------------------------------------- # pmodules::help_compile() { - echo "Usage: -$(basename $0) compile [OPTION...] -" + echo " +Usage: $(basename $0) compile [OPTION...] + +Compile and install the required tools for a new Pmodules environment. +ou need the permissions to write to the installation root. + +Options: +--prefix=DIR + Root of the Pmodules environment installation. The root of the + installation must be either specified via this option or the + environment variable PMODULES_ROOT. If this option is used and + the PMODULES_ROOT is set, the directory specified with this + option will be used. + +--debug + Enable verbose/debug output. + +--disable-cleanup ) + Do not cleanup the tmp directory after compilation and installation. + +--force | -f + Force compilation. + +--help + Print this help text. + +" 1>&2 std::die 1 "" } @@ -293,34 +285,31 @@ pmodules::compile() { std::die 3 "Compiling '${name}' failed!" } + local prefix="${PMODULES_ROOT:-${DEFAULT_PMODULES_ROOT}}" local opt_force='no' local config_file='' while (( $# > 0 )); do case $1 in + --prefix ) + prefix="$2" + shift 1 + ;; + --prefix=* ) + prefix="${1#*=}" + ;; --disable-cleanup ) build_opts+=( "$1" ) ;; --debug ) build_opts+=( "$1" ) ;; - --config ) - config_file=$(std::get_abspath "$2") - shift 1 - ;; - --config=* ) - config_file=$(std::get_abspath "${1#*=}") - ;; - --pmodules-root ) - PMODULES_ROOT="$2" - shift 1 - ;; - --pmodules-root=* ) - PMODULES_ROOT="${1#*=}" - ;; -f | --force ) opt_force='yes' ;; + --help | -h | -\? ) + pmodules::help_compile + ;; -* ) std::die 1 "$1: illegal option" ;; @@ -331,12 +320,13 @@ pmodules::compile() { shift 1 done - echo "Configuration:" - echo " root of Pmodules environment: ${pmodules_root}" - echo " Pmodule prefix: ${PMODULES_HOME}" - + local config_file="${prefix}/${CONFIG_DIR}/${CONFIG_FILE}" read_config_file config_file + echo "Configuration:" + echo " root of Pmodules environment: ${prefix}" + echo " Pmodule prefix: ${PMODULES_HOME}" + if [[ ! -f "${PMODULES_HOME}/sbin/base64" ]] || [[ ${opt_force} == 'yes' ]]; then build coreutils fi @@ -366,13 +356,37 @@ pmodules::compile() { #----------------------------------------------------------------------------- # pmodules::help_install() { - echo "Usage: -$(basename $0) install [OPTION...] -" + echo " +Usage: $(basename $0) install [OPTION...] + +Install a new Pmodules version. + +Options: +--prefix=DIR + Root of the Pmodules environment installation. The root of the + installation must be either specified via this option or the + environment variable PMODULES_ROOT. If this option is used and + the PMODULES_ROOT is set, the directory specified with this + option will be used. + +--debug + Enable verbose/debug output. + +--disable-cleanup ) + Do not cleanup the tmp directory after compilation and installation. + +--force | -f + Force compilation. + +--help + Print this help text. + +" 1>&2 std::die 1 "" } pmodules::install() { + local prefix="${PMODULES_ROOT:-${DEFAULT_PMODULES_ROOT}}" local config_file='' local opt_force='no' @@ -381,26 +395,19 @@ pmodules::install() { --debug ) set -x ;; - --config ) - config_file="$2" + --prefix ) + prefix="$2" shift 1 ;; - --config=* ) - config_file="${1#*=}" - ;; - --debug ) - set -x - ;; - --pmodules-root ) - PMODULES_ROOT="$2" - shift 1 - ;; - --pmodules-root=* ) - PMODULES_ROOT="${1#*=}" + --prefix=* ) + prefix="${1#*=}" ;; -f | --force ) opt_force='yes' ;; + --help | -h | -\? ) + pmodules::help_install + ;; -* ) std::die 1 "$1: illegal option" ;; @@ -411,6 +418,7 @@ pmodules::install() { shift 1 done + local config_file="${prefix}/${CONFIG_DIR}/${CONFIG_FILE}" read_config_file 'config_file' ### @@ -428,7 +436,7 @@ pmodules::install() { sed_cmd+="s:@TCLSHDIR@:${PMODULES_HOME}/sbin:g;" sed_cmd+="s:@pager@::g;" sed_cmd+="s:@pageropts@::g;" - sed_cmd+="s:@etcdir@:/opt/psi/config:g;" + sed_cmd+="s:@etcdir@:${PMODULES_ROOT}/${CONFIG_DIR}:g;" sed_cmd+="s:@VERSIONING@:#:g;" sed_cmd+="s:@prefix@:${PMODULES_HOME}:g;" sed_cmd+="s:@initdir@:${PMODULES_HOME}/init:g;" @@ -511,18 +519,13 @@ while (( $# > 0 )); do shift $# ;; * ) - std::die 1 "$1: Unknown sub-command." + std::die 1 "Invalid sub-command '$1'.\n\nUse 'build --help' to get help..." ;; esac shift 1 done -[[ -n "${subcmd}" ]] || std::die 1 "Missing sub-command.\n\nUse 'build --help' to get some help..." - -if [[ "${SRC_DIR}/modbuild" -ot "${SRC_DIR}/modbuild.in" ]]; then - sed "${sed_cmd}" "${SRC_DIR}/modbuild.in" > "${SRC_DIR}/modbuild" - chmod 0755 "${SRC_DIR}/modbuild" -fi +[[ -n "${subcmd}" ]] || std::die 1 "Missing sub-command.\n\nUse 'build --help' to get help..." pmodules::${subcmd} "${subcmd_args[@]}" From cb7d0fbf986447e71675122c80415f490656a781 Mon Sep 17 00:00:00 2001 From: gsell Date: Sun, 1 Nov 2020 11:40:44 +0100 Subject: [PATCH 10/13] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6de9b41..ce46054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,9 @@ - Update to BASH 5.0 - Update to Tcl 8.6.10 +- bootstrap/build script reviewed, `--config` option removed, help for all + sub-commands added + **Fixed bugs: From 0b6a8995622d96ae6e0c61d6e8c6c20d496750ed Mon Sep 17 00:00:00 2001 From: gsell Date: Sun, 1 Nov 2020 11:44:40 +0100 Subject: [PATCH 11/13] Add new file --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..fd2f148 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Pmodules + +## \ No newline at end of file From d86ec4463a6a3da9725e1ccde6228d48752bc59f Mon Sep 17 00:00:00 2001 From: gsell Date: Sun, 1 Nov 2020 11:45:47 +0100 Subject: [PATCH 12/13] Add new file --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..24e5de6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + src + Copyright (C) 2020 Pmodules + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + src Copyright (C) 2020 Pmodules + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 44ba3638ef2e7fc1cddb09a6d51a40d8023159e4 Mon Sep 17 00:00:00 2001 From: gsell Date: Sun, 1 Nov 2020 12:32:27 +0100 Subject: [PATCH 13/13] Update README.md --- README.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fd2f148..0a9e10d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,51 @@ # Pmodules -## \ No newline at end of file +Pmodules are a hierarchical module environment based on [Environment Modules](http://modules.sourceforge.net). +For the time being they are still using the C implementation of the Environment Modules. + +*Future plans* +* Version 2 will be a re-implementation in Tcl using the modulecmd of Environment Modules. +* Version 3 will be implementat as extension of Environment Modules. + +## Install a new Pmodules environment + +All Pmodules and all required software is installed in a directory hierarchy +in one unique root directory. If required or prefered dedicated directories can +be defined for temporary files and/or downloaded files. + +In the most cases a Pmodules environment will be installed on a network file-system, +but local disk is of course also possible. Just make sure you have write access to +to Pmodules root directory. The Pmodules root directory defaults to `/opt/psi`. + +*Installation* +1. clone this repository and cd into it. +2. create the Pmodules root directory and make sure you have write access with + the user you want to use to setup the new Pmodules environment. In the following + steps we use `$PMODULES_ROOT` as symbols for the root directory. +3. Run + ``` + ./build configure --prefix=$PMODULES_ROOT + ``` + to configure a new Pmodules environment. This command creates the configuration + file `$PMODULES_ROOT/config/modbuild.conf` and some directories under `$PMODULES_ROOT` + required in the next steps. +4. Run + ``` + ./build compile --prefix=$PMODULES_ROOT + ``` + to compile and install the required tools. +5. Run + ``` + ./build install --prefix=$PMODULES_ROOT + ``` + to install the Pmodules scripts. + +If you don't want to use `$PMODULES_ROOT/var/tmp/${USER}` for temporary files +you can override the default by using the option `--tmpdir=TEMP_DIR` in step 3. + +If you don't want to use `$PMODULES_ROOT/var/distfiles` for downloaded files +you can override the default by using the option `--distfilesdir=DISTDIR` in step 3. + +## Install a new Pmodules version + +TBW \ No newline at end of file