Commit e66234d6 authored by gsell's avatar gsell
Browse files

Merge branch 'master' of gitorious.psi.ch:pmodules/src

parents 66accd02 ab9edd13
...@@ -77,8 +77,12 @@ die() { ...@@ -77,8 +77,12 @@ die() {
exit $ec exit $ec
} }
#abspath () {
# (cd "$1" && pwd)
#}
abspath () { abspath () {
(cd "$1" && pwd) readlink -f "$1"
} }
append_path () { append_path () {
......
...@@ -6,21 +6,26 @@ PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin ...@@ -6,21 +6,26 @@ PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin
unset CDPATH unset CDPATH
shopt -s expand_aliases shopt -s expand_aliases
declare -rx ARGS="$@"
declare -r BUILDSCRIPT_DIR=$( cd $(dirname "$0") && pwd ) declare -r BUILDSCRIPT_DIR=$( cd $(dirname "$0") && pwd )
declare -r BUILDSCRIPT="${BUILDSCRIPT_DIR}"/$(basename "$0") declare -r BUILDSCRIPT="${BUILDSCRIPT_DIR}"/$(basename "$0")
declare -rx ARGS="$@"
declare -rx SHLIBDIR=$( cd $(dirname "$BASH_SOURCE") && pwd ) declare -rx SHLIBDIR=$( cd $(dirname "$BASH_SOURCE") && pwd )
source "${SHLIBDIR}/lib.bash"
declare -rx BUILD_BASEDIR=$(abspath $SHLIBDIR/..)
declare -r OS=$(uname -s) declare -r OS=$(uname -s)
# number of parallel make jobs # number of parallel make jobs
declare -i JOBS=3 declare -i JOBS=3
source "${SHLIBDIR}/lib.bash"
declare -rx BUILD_BASEDIR=$(abspath $SHLIBDIR/..)
source "$(readlink ${BUILD_BASEDIR}/config/environment.bash)" source "$(readlink ${BUILD_BASEDIR}/config/environment.bash)"
declare -xr BUILD_CONFIGDIR="${BUILD_BASEDIR}/config" declare -xr BUILD_CONFIGDIR="${BUILD_BASEDIR}/config"
...@@ -29,7 +34,7 @@ declare -xr BUILD_TMPDIR="${BUILD_BASEDIR}/tmp" ...@@ -29,7 +34,7 @@ declare -xr BUILD_TMPDIR="${BUILD_BASEDIR}/tmp"
declare -xr BUILD_DOWNLOADSDIR="${BUILD_BASEDIR}/Downloads" declare -xr BUILD_DOWNLOADSDIR="${BUILD_BASEDIR}/Downloads"
declare -xr BUILD_VERSIONSFILE="${BUILD_CONFIGDIR}/versions.conf" declare -xr BUILD_VERSIONSFILE="${BUILD_CONFIGDIR}/versions.conf"
#source "${BUILD_CONFIGDIR}/Pmodules.conf" source "${BUILD_CONFIGDIR}/Pmodules.conf"
declare -x PREFIX='' declare -x PREFIX=''
declare -x DOCDIR='' declare -x DOCDIR=''
......
...@@ -1028,7 +1028,7 @@ subcommand_use() { ...@@ -1028,7 +1028,7 @@ subcommand_use() {
# ... # ...
# elif is directory # elif is directory
# ... # ...
local modulfiles_dir="${PMODULES_ROOT}/${arg}/${PMODULES_MODULEFILES_DIR}" local modulefiles_dir="${PMODULES_ROOT}/${arg}/${PMODULES_MODULEFILES_DIR}"
if [[ ${arg} == -a ]] || [[ ${arg} == --append ]]; then if [[ ${arg} == -a ]] || [[ ${arg} == --append ]]; then
subcommand_switches='--append' subcommand_switches='--append'
elif [[ ${arg} == -p ]] || [[ ${arg} == --prepend ]]; then elif [[ ${arg} == -p ]] || [[ ${arg} == --prepend ]]; then
...@@ -1091,7 +1091,7 @@ subcommand_unuse() { ...@@ -1091,7 +1091,7 @@ subcommand_unuse() {
# ... # ...
# elif is directory # elif is directory
# ... # ...
local modulfiles_dir="${PMODULES_ROOT}/${arg}/${PMODULES_MODULEFILES_DIR}" local modulefiles_dir="${PMODULES_ROOT}/${arg}/${PMODULES_MODULEFILES_DIR}"
if is_release "${arg}"; then if is_release "${arg}"; then
remove_path UsedReleases "${arg}" remove_path UsedReleases "${arg}"
elif [[ ! ${arg} =~ */* ]] && [[ -d ${modulefiles_dir} ]]; then elif [[ ! ${arg} =~ */* ]] && [[ -d ${modulefiles_dir} ]]; then
...@@ -1099,7 +1099,7 @@ subcommand_unuse() { ...@@ -1099,7 +1099,7 @@ subcommand_unuse() {
die 3 "${CMD} ${0##_}: cannot remove group ${arg} from module path" die 3 "${CMD} ${0##_}: cannot remove group ${arg} from module path"
fi fi
remove_path PMODULES_USED_GROUPS "${arg}" remove_path PMODULES_USED_GROUPS "${arg}"
dirs_to_remove+=( ${modulefiles_dir}/${arg} ) dirs_to_remove+=( ${modulefiles_dir} )
elif [[ -d ${arg} ]]; then elif [[ -d ${arg} ]]; then
local normalized_dir=$(cd "${arg}" && pwd) local normalized_dir=$(cd "${arg}" && pwd)
dirs_to_remove+=( ${normalized_dir} ) dirs_to_remove+=( ${normalized_dir} )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment