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

modbuild: use full path to call yq

Browse Source
This commit is contained in:
gsell
2022-07-01 16:29:17 +02:00
parent bf17ee6075
commit 9a8fd16372
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/modbuild.in
+8 -8
View File
@@ -452,7 +452,7 @@ build_modules_yaml(){
local -n _result="$1"
local fname="$2"
local version="$3"
_result=( $(yq -Ne e \
_result=( $(${yq} -Ne e \
"with_entries(select(.key | test(\"^${version}\$\")))|keys" \
"${fname}" 2>/dev/null | awk '{print $2}') )
}
@@ -461,7 +461,7 @@ build_modules_yaml(){
local -n _result="$1"
local fname="$2"
local version="$3"
_result=$(yq -Ne e ".\"${version}\"|length" \
_result=$(${yq} -Ne e ".\"${version}\"|length" \
"${fname}" 2>/dev/null)
if (( $? != 0 )); then
_result=0
@@ -473,7 +473,7 @@ build_modules_yaml(){
local fname="$2"
local version="$3"
local idx="$4"
_result=$(yq -Ne e ".\"${version}\"[${idx}].relstage" \
_result=$(${yq} -Ne e ".\"${version}\"[${idx}].relstage" \
"${fname}" 2>/dev/null)
(( $? != 0 )) && relstage='unstable' || :
}
@@ -483,10 +483,10 @@ build_modules_yaml(){
local fname="$2"
local version="$3"
local idx="$4"
_result=$(yq -Ne e ".\"${version}\"[${idx}].overlay" \
_result=$(${yq} -Ne e ".\"${version}\"[${idx}].overlay" \
"${fname}" 2>/dev/null)
(( $? == 0 )) && return
_result=$(yq -Ne e ".overlay" "${fname}" 2>/dev/null)
_result=$(${yq} -Ne e ".overlay" "${fname}" 2>/dev/null)
(( $? == 0 )) && return
_result='base'
}
@@ -496,10 +496,10 @@ build_modules_yaml(){
local fname="$2"
local version="$3"
local idx="$4"
_result=$(yq -Ne e ".\"${version}\"[${idx}].systems" \
_result=$(${yq} -Ne e ".\"${version}\"[${idx}].systems" \
"${fname}" 2>/dev/null)
(( $? == 0 )) && return
_result=$(yq -Ne e ".systems" "${fname}" 2>/dev/null)
_result=$(${yq} -Ne e ".systems" "${fname}" 2>/dev/null)
(( $? == 0 )) && return
_result='any'
}
@@ -509,7 +509,7 @@ build_modules_yaml(){
local fname="$2"
local version="$3"
local idx="$4"
_result=( $(yq -Ne e ".\"${version}\"[${idx}]|(.with, .dependencies)" \
_result=( $(${yq} -Ne e ".\"${version}\"[${idx}]|(.with, .dependencies)" \
"${fname}" 2>/dev/null) )
if (( $? != 0 )); then
# neither .with nor .dependencies are set