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

Pmodules/bash

@@ -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

@@ -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

@@ -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

@@ -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,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

@@ -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

@@ -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,4 +1,4 @@
-#!@PMODULES_HOME@/bin/tclsh
+#!@PMODULES_HOME@/sbin/tclsh
 
 ########################################################################
 # This is a pure TCL implementation of the module command