mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-27 18:13:08 +02:00
Merge pull request #1332 from Pmodules/1331-libpmodules-missing-curly-bracket-readlink-must-be-called-with--f
libpmodules: error fixes
This commit is contained in:
+2
-2
@@ -4,7 +4,7 @@
|
||||
|
||||
### modulecmd
|
||||
* Misleading error message fixed if system configuration file is not readable.
|
||||
(#1316)
|
||||
(#1316, #1331)
|
||||
|
||||
### build system
|
||||
* Function to simplify building modules with pip3 added.
|
||||
@@ -14,7 +14,7 @@
|
||||
(#1327)
|
||||
* default values for `PMODULES_TMPDIR` and `PMODULES_DISTFILESDIR` are now
|
||||
more general.
|
||||
(#1325)
|
||||
(#1325, #1331)
|
||||
* set CC and CXX if not defined. This was a bug introduced in 2.0.2
|
||||
(#1322)
|
||||
|
||||
|
||||
@@ -451,7 +451,7 @@ pm::read_config(){
|
||||
if [[ -v PMODULES_CONFIG_FILE && -n "${PMODULES_CONFIG_FILE}" ]]; then
|
||||
sys_config_file="${PMODULES_HOME%%/Tools*}/config/${PMODULES_CONFIG_FILE}"
|
||||
fi
|
||||
sys_config_file=$(readlink "${sys_config_file}")
|
||||
sys_config_file=$(readlink -f "${sys_config_file}")
|
||||
test -r "${sys_config_file}" || \
|
||||
std::die 3 \
|
||||
"%s %s -- %s" \
|
||||
@@ -472,8 +472,8 @@ pm::read_config(){
|
||||
OverlayInfo[none:type]='n'
|
||||
OverlayInfo[none:layout]='flat'
|
||||
|
||||
PMODULES_DISTFILESDIR=${PMODULES_DISTFILESDIR:-"${DistfilesDir}"}
|
||||
PMODULES_TMPDIR="${PMODULES_TMPDIR:-${TmpDir}"
|
||||
PMODULES_DISTFILESDIR="${PMODULES_DISTFILESDIR:-${DistfilesDir}}"
|
||||
PMODULES_TMPDIR="${PMODULES_TMPDIR:-${TmpDir}}"
|
||||
export PMODULES_DISTFILESDIR PMODULES_TMPDIR
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user