mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-07-11 16:00:48 +02:00
better solution to define used commands implemented
This commit is contained in:
@@ -35,6 +35,17 @@ std::die() {
|
|||||||
exit $ec
|
exit $ec
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::def_cmds(){
|
||||||
|
local path="$1"
|
||||||
|
shift
|
||||||
|
for cmd in "$@"; do
|
||||||
|
eval declare -g ${cmd}=$(PATH="${path}" which $cmd 2>/dev/null)
|
||||||
|
if [[ -z "${!cmd}" ]]; then
|
||||||
|
std::die 255 "${cmd} not found"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
# get answer to yes/no question
|
# get answer to yes/no question
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -13,30 +13,14 @@ declare prefix=$(dirname "${mydir}")
|
|||||||
declare -r libdir="${prefix}/lib"
|
declare -r libdir="${prefix}/lib"
|
||||||
declare -r libexecdir="${prefix}/libexec"
|
declare -r libexecdir="${prefix}/libexec"
|
||||||
|
|
||||||
base64=$(PATH=/bin:/usr/bin /usr/bin/which base64)
|
|
||||||
declare -r base64
|
|
||||||
mktemp=$(PATH=/bin:/usr/bin /usr/bin/which mktemp)
|
|
||||||
declare -r mktemp
|
|
||||||
sort=$(PATH=/bin:/usr/bin /usr/bin/which sort)
|
|
||||||
declare -r sort
|
|
||||||
awk=$(PATH=/bin:/usr/bin /usr/bin/which awk)
|
|
||||||
declare -r awk
|
|
||||||
rm=$(PATH=/bin:/usr/bin /usr/bin/which rm)
|
|
||||||
declare -r rm
|
|
||||||
logger=$(PATH=/bin:/usr/bin /usr/bin/which logger)
|
|
||||||
declare -r logger
|
|
||||||
|
|
||||||
if [[ $(uname -s) == 'Darwin' ]]; then
|
|
||||||
declare -r getopt="${libexecdir}/getopt"
|
|
||||||
declare -r find="${libexecdir}/find"
|
|
||||||
else
|
|
||||||
getopt=$(PATH=/bin:/usr/bin /usr/bin/which getopt)
|
|
||||||
declare -r getopt
|
|
||||||
find=$(PATH=/bin:/usr/bin /usr/bin/which find)
|
|
||||||
declare -r find
|
|
||||||
fi
|
|
||||||
|
|
||||||
source "${libdir}/libstd.bash"
|
source "${libdir}/libstd.bash"
|
||||||
|
source "${libdir}/libpmodules.bash"
|
||||||
|
|
||||||
|
path="/bin:/usr/bin"
|
||||||
|
[[ $(uname -s) == 'Darwin' ]] && path+=":${libexecdir}"
|
||||||
|
std::def_cmds "${path}" \
|
||||||
|
'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \
|
||||||
|
'rm' 'sort' 'find'
|
||||||
|
|
||||||
if [[ ${PMODULES_PURETCL} == yes ]]; then
|
if [[ ${PMODULES_PURETCL} == yes ]]; then
|
||||||
declare -r modulecmd="${libexecdir}/modulecmd.tcl"
|
declare -r modulecmd="${libexecdir}/modulecmd.tcl"
|
||||||
|
|||||||
Reference in New Issue
Block a user