mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gsell
2015-05-06 15:27:37 +02:00
parent 575704d8ec 21e9b9720f
commit 214f98fcf9
5 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/Bootstrap/Pmodules/bash
View File

@@ -124,7 +124,7 @@ save_env() {
s+="$( typeset -p $1 );"
shift
done
echo export PMODULES_ENV=$( base64 <<< "$s" )
echo export PMODULES_ENV=$( "${PMODULES_HOME}/bin/base64" --wrap=0 <<< "$s" )
}
#module purge

10
scripts/Bootstrap/Pmodules/modulecmd.in
View File

@@ -37,7 +37,7 @@ save_env() {
s+="$( typeset -p $1 );"
shift
done
echo export PMODULES_ENV=$( base64 <<< "$s" )
echo export PMODULES_ENV=$( "${PMODULES_HOME}/bin/base64" --wrap=0 <<< "$s" )
}
export_env() {
@@ -425,14 +425,12 @@ get_release() {
: ${PMODULES_DEFINED_RELEASES:=':unstable:stable:deprecated:'}
declare used_releases=":${USED_RELEASES}:"
is_release() {
[[ ${PMODULES_DEFINED_RELEASES} =~ :$1: ]]
}
is_used_release() {
[[ ${used_releases} =~ :$1: ]]
[[ ":${USED_RELEASES}:" =~ :$1: ]]
}
declare used_families=":${PMODULES_USED_GROUPS}:"
@@ -992,7 +990,7 @@ subcommand_use() {
done
info "\nUsed releases:"
for r in ${used_releases//:/ }; do
for r in ${USED_RELEASES//:/ }; do
info "\t${r}"
done
info "\nUnused releases:"
@@ -1435,7 +1433,7 @@ subcommand_initclear() {
}
if [[ -n ${PMODULES_ENV} ]]; then
eval "$(base64 -D <<< "${PMODULES_ENV}" 2>/dev/null)"
eval "$("${PMODULES_HOME}/bin/base64" -d <<< "${PMODULES_ENV}" 2>/dev/null)"
fi
case $1 in

11
scripts/Bootstrap/compile_pmodules.sh
View File

@@ -8,11 +8,12 @@ source "${BOOTSTRAP_DIR}/Pmodules_version.conf"
unset PMODULES_HOME
source "/opt/psi/config/environment.bash"
${BOOTSTRAP_DIR}/gettext/build --bootstrap || { echo "compiling 'gettext' failed!"; exit 1; }
${BOOTSTRAP_DIR}/getopt/build --bootstrap || { echo "compiling 'getopt' failed!"; exit 1; }
${BOOTSTRAP_DIR}/dialog/build --bootstrap || { echo "compiling 'dialog' failed!"; exit 1; }
${BOOTSTRAP_DIR}/bash/build --bootstrap || { echo "compiling 'bash' failed!"; exit 1; }
${BOOTSTRAP_DIR}/Tcl/build --bootstrap || { echo "compiling 'Tcl' failed!"; exit 1; }
${BOOTSTRAP_DIR}/coreutils/build --bootstrap || { echo "compiling 'coreutils' failed!"; exit 1; }
${BOOTSTRAP_DIR}/gettext/build --bootstrap || { echo "compiling 'gettext' failed!"; exit 1; }
${BOOTSTRAP_DIR}/getopt/build --bootstrap || { echo "compiling 'getopt' failed!"; exit 1; }
${BOOTSTRAP_DIR}/dialog/build --bootstrap || { echo "compiling 'dialog' failed!"; exit 1; }
${BOOTSTRAP_DIR}/bash/build --bootstrap || { echo "compiling 'bash' failed!"; exit 1; }
${BOOTSTRAP_DIR}/Tcl/build --bootstrap || { echo "compiling 'Tcl' failed!"; exit 1; }
# we have to remove the init directory - otherwise the next build will fail...
rm -rf "${PMODULES_HOME}/init"

12
scripts/Bootstrap/coreutils/build Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
em.add_to_family 'Tools'
em.make_all