pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-07-01 11:49:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pmodules/libpbuild.bash

Browse Source 
- find_tarball(): do not check certificate while wget'ing
- load_build_dependencies(): check OS variants first
This commit is contained in:
gsell
2016-11-10 06:22:11 -08:00
parent ffe73b9b30
commit 631f99b2c8
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+9 -10
View File
@@ -221,7 +221,7 @@ find_tarball() {
std::error "${name}/${version}: source not found."
exit 43
fi
wget --directory-prefix="${PMODULES_DISTFILESDIR}" "${SOURCE_URL}"
wget --no-check-certificate --directory-prefix="${PMODULES_DISTFILESDIR}" "${SOURCE_URL}"
if (( $? != 0 )); then
std::error "${name}/${version}: cannot download source."
exit 43
@@ -425,22 +425,21 @@ pbuild::make_all() {
#
load_build_dependencies() {
local -a eligible_variants_files=()
eligible_variants_files+=( "${V}/variants" )
eligible_variants_files+=( "${V}/variants.${OS}" )
eligible_variants_files+=( "${V%.*}/variants" )
eligible_variants_files+=( "${V}/variants" )
eligible_variants_files+=( "${V%.*}/variants.${OS}" )
eligible_variants_files+=( "${V%.*.*}/variants" )
eligible_variants_files+=( "${V%.*}/variants" )
eligible_variants_files+=( "${V%.*.*}/variants.${OS}" )
eligible_variants_files+=( "${V%.*.*}/variants" )
local found='no'
local variants_file=''
for variants_file in "${eligible_variants_files[@]}"; do
if [[ -e "${BUILD_BLOCK_DIR}/${variants_file}" ]]; then
found='yes'
variants_file="${BUILD_BLOCK_DIR}/${variants_file}"
break
fi
if [[ -e "${BUILD_BLOCK_DIR}/${variants_file}" ]]; then
found='yes'
variants_file="${BUILD_BLOCK_DIR}/${variants_file}"
break
fi
done
local m
if [[ "${found}" == "yes" ]]; then
# :FIXME: