pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-06-28 10:29:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

implement/fix issue #2: move additional binaries to "$PMODULES_HOME/sbin"

Browse Source
This commit is contained in:
gsell
2017-01-09 17:25:51 +01:00
parent c8899ef733
commit e0423db6f4
19 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/bash
+1 -1
View File
@@ -91,7 +91,7 @@ save_env() {
s+="$( typeset -p $1 );"
shift
done
echo export PMODULES_ENV=$( "${PMODULES_HOME}/bin/base64" --wrap=0 <<< "$s" )
echo export PMODULES_ENV=$( "${PMODULES_HOME}/sbin/base64" --wrap=0 <<< "$s" )
}
#module purge
Pmodules/libpbuild.bash
+8 -2
View File
@@ -222,10 +222,15 @@ find_tarball() {
[[ -r "${fname}" ]] && break
done
if [[ "${fname}" == 'not found' ]] && [[ -n "${SOURCE_URL}" ]]; then
wget --no-check-certificate \
--directory-prefix="${PMODULES_DISTFILESDIR}" \
curl --insecure \
--output "${PMODULES_DISTFILESDIR}/${basename}" \
"${SOURCE_URL}" ||
std::info "Downloading sources from '${SOURCE_URL}' failed."
sleep 2
#wget --no-check-certificate \
# --directory-prefix="${PMODULES_DISTFILESDIR}" \
# "${SOURCE_URL}" ||
# std::info "Downloading sources from '${SOURCE_URL}' failed."
fname= "${PMODULES_DISTFILESDIR}/${basename}"
fi
if [[ -r "${fname}" ]]; then
@@ -696,6 +701,7 @@ pbuild::make_all() {
DYLD_LIBRARY_PATH="${PREFIX}/lib"
PATH+=":${PREFIX}/bin"
PATH+=":${PREFIX}/sbin"
}
#......................................................................
Pmodules/libpmodules.bash
+2 -1
View File
@@ -3,10 +3,11 @@
if [[ -z ${bindir} ]]; then
local bindir=$(dirname "${BASH_SOURCE}")
bindir=$(cd "${bindir}"/.. && pwd)"/bin"
sbindir=$(cd "${bindir}"/.. && pwd)"/sbin"
fi
pmodules::get_options() {
"${bindir}/getopt" "$@"
"${sbindir}/getopt" "$@"
}
pmodules::check_env_vars() {
Pmodules/modmanage
+2 -2
View File
@@ -1,6 +1,6 @@
#!/bin/bash --noprofile
#!/bin/sh
unset BASH_ENV
declare -r bindir=$( cd $(dirname $0) && pwd -P )
bindir=$( cd $(dirname "$0")/../sbin && pwd -P )
"${bindir}/bash" --noprofile --norc "${bindir}/../libexec/modmanage.bash" "$@"
Pmodules/modmanage.bash.in
+1 -1
View File
@@ -1,4 +1,4 @@
#!@PMODULES_HOME@/bin/bash
#!@PMODULES_HOME@/sbin/bash
# we have to unset CDPATH, otherwise 'cd' prints the directoy!
unset CDPATH
Pmodules/modulecmd
+1 -1
View File
@@ -2,5 +2,5 @@
unset BASH_ENV
bindir=$( cd $(dirname "$0") && pwd -P )
bindir=$( cd $(dirname "$0")/../sbin && pwd -P )
"${bindir}/bash" --noprofile --norc "${bindir}/../libexec/modulecmd.bash" "$@"
Pmodules/modulecmd.bash.in
+5 -4
View File
@@ -1,4 +1,4 @@
#!@PMODULES_HOME@/bin/bash --noprofile
#!@PMODULES_HOME@/sbin/bash --noprofile
#
#set -o nounset
@@ -11,13 +11,14 @@ declare -r CMD='module'
declare -r mydir=$(cd $(dirname "$0") && pwd)
declare prefix=$(dirname "${mydir}")
declare -r bindir="${prefix}/bin"
declare -r sbindir="${prefix}/sbin"
declare -r libdir="${prefix}/lib"
declare -r libexecdir="${prefix}/libexec"
source "${libdir}/libstd.bash"
source "${libdir}/libpmodules.bash"
PATH="${bindir}:${PATH}"
PATH="${sbindir}:${bindir}:${PATH}"
declare -r version='@PMODULES_VERSION@'
@@ -73,7 +74,7 @@ pbuild::save_env() {
[[ -n "${tmp}" ]] && s+="${tmp};"
shift
done
declare -g PMODULES_ENV=$( "${PMODULES_HOME}/bin/base64" --wrap=0 <<< "$s" )
declare -g PMODULES_ENV=$( "${PMODULES_HOME}/sbin/base64" --wrap=0 <<< "$s" )
pbuild::export_env ${shell} PMODULES_ENV
}
@@ -1832,7 +1833,7 @@ subcommand_initclear() {
}
if [[ -n ${PMODULES_ENV} ]]; then
eval "$("${PMODULES_HOME}/bin/base64" -d <<< "${PMODULES_ENV}" 2>/dev/null)"
eval "$("${PMODULES_HOME}/sbin/base64" -d <<< "${PMODULES_ENV}" 2>/dev/null)"
else
pmodules_init
fi
Pmodules/modulecmd.tcl.in
+1 -1
View File
@@ -1,4 +1,4 @@
#!@PMODULES_HOME@/bin/tclsh
#!@PMODULES_HOME@/sbin/tclsh
########################################################################
# This is a pure TCL implementation of the module command
Tcl/build
+2 -1
View File
@@ -12,12 +12,13 @@ pbuild::configure() {
esac
"${srcdir}"/configure \
--prefix="${PREFIX}" \
--bindir="${PREFIX}/sbin" \
--enable-shared=no \
|| exit 1
}
pbuild::post_install() {
{ cd "${PREFIX}"/bin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
{ cd "${PREFIX}"/sbin && rm -f tclsh && ln -fs tclsh${V%.*} tclsh; };
}
pbuild::add_to_group 'Tools'
bash/build
+1
View File
@@ -5,6 +5,7 @@ SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
pbuild::configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--bindir="${PREFIX}/sbin" \
|| exit 1
}
compile_pmodules.sh
+9 -6
View File
@@ -6,7 +6,6 @@ unset PMODULES_HOME
unset PMODULES_VERSION
source "${BOOTSTRAP_DIR}/Pmodules/libstd.bash"
source "${BOOTSTRAP_DIR}/config/environment.bash"
declare force='no'
@@ -33,6 +32,10 @@ while (( $# > 0 )); do
done
std::read_versions "${BOOTSTRAP_DIR}/config/versions.conf"
source "${BOOTSTRAP_DIR}/config/environment.bash"
PMODULES_VERSION=''
declare -x PMODULES_VERSION
echo $PMODULES_VERSION
#if [[ -n ${PMODULES_DIR} ]] && [[ "${PMODULES_DIR}" != "/" ]] && [[ -d "${PMODULES_DIR}" ]]; then
# rm -rf "${PMODULES_DIR}"
@@ -47,11 +50,11 @@ build () {
std::die 3 "Compiling '${name}' failed!"
}
if [[ ! -f "${PMODULES_HOME}/bin/base64" ]] || [[ ${force} == 'yes' ]]; then
if [[ ! -f "${PMODULES_HOME}/sbin/base64" ]] || [[ ${force} == 'yes' ]]; then
build coreutils "${COREUTILS_VERSION}"
fi
if [[ ! -f "${PMODULES_HOME}/bin/xgettext" ]] || [[ ${force} == 'yes' ]]; then
if [[ ! -f "${PMODULES_HOME}/sbin/xgettext" ]] || [[ ${force} == 'yes' ]]; then
build gettext "${GETTEXT_VERSION}"
fi
@@ -59,15 +62,15 @@ if [[ ! -f "${PMODULES_HOME}/bin/getopt" ]] || [[ ${force} == 'yes' ]]; then
build getopt "${GETOPT_VERSION}"
fi
if [[ ! -f "${PMODULES_HOME}/bin/dialog" ]] || [[ ${force} == 'yes' ]]; then
if [[ ! -f "${PMODULES_HOME}/sbin/dialog" ]] || [[ ${force} == 'yes' ]]; then
build dialog "${DIALOG_VERSION}"
fi
if [[ ! -f "${PMODULES_HOME}/bin/bash" ]] || [[ ${force} == 'yes' ]]; then
if [[ ! -f "${PMODULES_HOME}/sbin/bash" ]] || [[ ${force} == 'yes' ]]; then
build bash "4.3.30"
fi
if [[ ! -e "${PMODULES_HOME}/bin/tclsh" ]] || [[ ${force} == 'yes' ]]; then
if [[ ! -e "${PMODULES_HOME}/sbin/tclsh" ]] || [[ ${force} == 'yes' ]]; then
build Tcl "${TCL_VERSION}"
fi
config/environment.bash.in
-2
View File
@@ -6,8 +6,6 @@ declare -x PMODULES_CONFIG_DIR='config'
declare -x PMODULES_MODULEFILES_DIR='modulefiles'
declare -x PMODULES_TEMPLATES_DIR='templates'
declare -x PMODULES_VERSION="0.99.6"
declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
config/environment.bash.psi
-2
View File
@@ -6,8 +6,6 @@ declare -x PMODULES_CONFIG_DIR='config'
declare -x PMODULES_MODULEFILES_DIR='modulefiles'
declare -x PMODULES_TEMPLATES_DIR='templates'
declare -x PMODULES_VERSION="0.99.7"
declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
config/versions.conf
+1 -1
View File
@@ -4,5 +4,5 @@ dialog 1.3-20160828
getopt 1.1.6
gettext 0.19.4
Modules 3.2.10
Pmodules 0.99.7
Pmodules 0.99.8
Tcl 8.6.6
coreutils/build
+2 -1
View File
@@ -4,7 +4,8 @@ SOURCE_URL="http://ftp.gnu.org/gnu/coreutils/$P-$V.tar.xz"
pbuild::configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--prefix="${PREFIX}" \
--bindir="${PREFIX}"/sbin \
|| exit 1
}
dialog/build
+1
View File
@@ -5,6 +5,7 @@ SOURCE_URL="ftp://invisible-island.net/$P/$P-$V.tgz"
pbuild::configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--bindir="${PREFIX}/sbin" \
|| exit 1
}
getopt/build
+2
View File
@@ -31,6 +31,8 @@ pbuild::install() {
declare -x DESTDIR="${PREFIX}"
declare -x prefix=''
make -e install
mkdir -p "${PREFIX}/sbin"
mv "${PREFIX}/bin/getopt" "${PREFIX}/sbin"
}
pbuild::cleanup_build() {
gettext/build
+1
View File
@@ -5,6 +5,7 @@ SOURCE_URL="https://ftp.gnu.org/pub/gnu/$P/$P-$V.tar.gz"
pbuild::configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--bindir="${PREFIX}/sbin" \
--disable-java \
--disable-threads \
--disable-shared \
install_pmodules.sh
+5 -1
View File
@@ -1,12 +1,16 @@
#!/bin/bash
declare BOOTSTRAP_DIR=$(dirname "$0")
unset PMODULES_HOME
unset PMODULES_VERSION
source "${BOOTSTRAP_DIR}/Pmodules/libstd.bash"
source "${BOOTSTRAP_DIR}/config/environment.bash"
declare -r BOOTSTRAP_DIR=$(std::get_abspath "${BOOTSTRAP_DIR}")
declare -r SRC_DIR="${BOOTSTRAP_DIR}/Pmodules"
std::read_versions "${BOOTSTRAP_DIR}/config/versions.conf"
source "${BOOTSTRAP_DIR}/config/environment.bash"
echo "Installing to ${PMODULES_HOME} ..."