comparison sbin/fports @ 788:7ca4a36e9e8d

fports, ports.subr: Use the variable PKG as path to /usr/bin/pkg
author Franz Glasner <fzglas.hg@dom66.de>
date Tue, 29 Oct 2024 12:20:41 +0100
parents 004c676c3415
children e48d173534ec
comparison
equal deleted inserted replaced
787:004c676c3415 788:7ca4a36e9e8d
114 pkgqueue='' 114 pkgqueue=''
115 farray_create pkgqueue # queue (array) of packages that are queued for 115 farray_create pkgqueue # queue (array) of packages that are queued for
116 # resolution 116 # resolution
117 117
118 for pkg in "$@"; do 118 for pkg in "$@"; do
119 if ! pkg query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then 119 if ! "${PKG}" query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then
120 farray_release pkgqueue 120 farray_release pkgqueue
121 fatal "${EX_DATAERR}" "Package not found: ${pkg}" 121 fatal "${EX_DATAERR}" "Package not found: ${pkg}"
122 fi 122 fi
123 farray_append pkgqueue "${pkg}" 123 farray_append pkgqueue "${pkg}"
124 done 124 done
131 while IFS=$' \t\n' read -r n v; do 131 while IFS=$' \t\n' read -r n v; do
132 [ -z "${n}" ] || [ -z "${v}" ] && continue 132 [ -z "${n}" ] || [ -z "${v}" ] && continue
133 farray_append curdeps "${n}=${v}" 133 farray_append curdeps "${n}=${v}"
134 farray_append pkgqueue "${n}" 134 farray_append pkgqueue "${n}"
135 done <<EOF_01a8cebe-8659-4e32-87a4-bbce117e386b 135 done <<EOF_01a8cebe-8659-4e32-87a4-bbce117e386b
136 $(LC_ALL=C.UTF-8 pkg query '%dn %dv' "${pkg}") 136 $(LC_ALL=C.UTF-8 "${PKG}" query '%dn %dv' "${pkg}")
137 EOF_01a8cebe-8659-4e32-87a4-bbce117e386b 137 EOF_01a8cebe-8659-4e32-87a4-bbce117e386b
138 falist_set pkgdeps "${pkg}" "${curdeps}" 138 falist_set pkgdeps "${pkg}" "${curdeps}"
139 farray_release curdeps 139 farray_release curdeps
140 curdeps='' 140 curdeps=''
141 fi 141 fi
143 farray_release pkgqueue 143 farray_release pkgqueue
144 # falist_debug pkgdeps 144 # falist_debug pkgdeps
145 if checkyesno flat; then 145 if checkyesno flat; then
146 for pkg in "$@"; do 146 for pkg in "$@"; do
147 _flatten_pkgdeps flatdeps "${pkgdeps}" "${pkg}" 147 _flatten_pkgdeps flatdeps "${pkgdeps}" "${pkg}"
148 _print_flatdeps '-->' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${flatdeps}" 148 _print_flatdeps '-->' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${flatdeps}"
149 falist_release "${flatdeps}" 149 falist_release "${flatdeps}"
150 done 150 done
151 else 151 else
152 for pkg in "$@"; do 152 for pkg in "$@"; do
153 _print_dependency_tree 0 "${maxlevel}" '-->' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${pkgdeps}" 153 _print_dependency_tree 0 "${maxlevel}" '-->' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${pkgdeps}"
154 done 154 done
155 fi 155 fi
156 falist_release pkgdeps 156 falist_release pkgdeps
157 } 157 }
158 158
174 pkgqueue='' 174 pkgqueue=''
175 farray_create pkgqueue # queue (array) of packages that are queued for 175 farray_create pkgqueue # queue (array) of packages that are queued for
176 # resolution 176 # resolution
177 177
178 for pkg in "$@"; do 178 for pkg in "$@"; do
179 if ! pkg query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then 179 if ! "${PKG}" query '%n' "${pkg}" 1>/dev/null 2>/dev/null ; then
180 farray_release pkgqueue 180 farray_release pkgqueue
181 fatal "${EX_DATAERR}" "Package not found: ${pkg}" 181 fatal "${EX_DATAERR}" "Package not found: ${pkg}"
182 fi 182 fi
183 farray_append pkgqueue "${pkg}" 183 farray_append pkgqueue "${pkg}"
184 done 184 done
191 while IFS=$' \t\n' read -r n v; do 191 while IFS=$' \t\n' read -r n v; do
192 [ -z "${n}" ] || [ -z "${v}" ] && continue 192 [ -z "${n}" ] || [ -z "${v}" ] && continue
193 farray_append curdeps "${n}=${v}" 193 farray_append curdeps "${n}=${v}"
194 farray_append pkgqueue "${n}" 194 farray_append pkgqueue "${n}"
195 done <<EOF_5079e996-c6d2-4e6d-825d-53183a64ab06 195 done <<EOF_5079e996-c6d2-4e6d-825d-53183a64ab06
196 $(LC_ALL=C.UTF-8 pkg query '%rn %rv' "${pkg}") 196 $(LC_ALL=C.UTF-8 "${PKG}" query '%rn %rv' "${pkg}")
197 EOF_5079e996-c6d2-4e6d-825d-53183a64ab06 197 EOF_5079e996-c6d2-4e6d-825d-53183a64ab06
198 falist_set pkgdeps "${pkg}" "${curdeps}" 198 falist_set pkgdeps "${pkg}" "${curdeps}"
199 farray_release curdeps 199 farray_release curdeps
200 curdeps='' 200 curdeps=''
201 fi 201 fi
203 farray_release pkgqueue 203 farray_release pkgqueue
204 # falist_debug pkgdeps 204 # falist_debug pkgdeps
205 if checkyesno flat; then 205 if checkyesno flat; then
206 for pkg in "$@"; do 206 for pkg in "$@"; do
207 _flatten_pkgdeps flatdeps "${pkgdeps}" "${pkg}" 207 _flatten_pkgdeps flatdeps "${pkgdeps}" "${pkg}"
208 _print_flatdeps '<--' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${flatdeps}" 208 _print_flatdeps '<--' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${flatdeps}"
209 falist_release "${flatdeps}" 209 falist_release "${flatdeps}"
210 done 210 done
211 else 211 else
212 for pkg in "$@"; do 212 for pkg in "$@"; do
213 _print_dependency_tree 0 "${maxlevel}" '<--' "${pkg}" "$(LC_ALL=C.UTF-8 pkg query '%v' "${pkg}")" "${pkgdeps}" 213 _print_dependency_tree 0 "${maxlevel}" '<--' "${pkg}" "$(LC_ALL=C.UTF-8 "${PKG}" query '%v' "${pkg}")" "${pkgdeps}"
214 done 214 done
215 fi 215 fi
216 falist_release pkgdeps 216 falist_release pkgdeps
217 } 217 }
218 218