@@ -22,22 +22,26 @@ main() {
2222
2323 curl --retry 3 -sSfL " ${pkg_source} /packagesite.txz" -O
2424 tar -C " ${td} /packagesite" -xJf packagesite.txz
25- local openssl_ver
26- local sqlite_ver
27- openssl_ver=$( jq -c ' . | select ( .name == "openssl" ) | .version' " ${td} /packagesite/packagesite.yaml" )
28- sqlite_ver=$( jq -c ' . | select ( .name == "sqlite3" ) | .version' " ${td} /packagesite/packagesite.yaml" )
29- openssl_ver=${openssl_ver// ' "' / }
30- sqlite_ver=${sqlite_ver// ' "' / }
25+ local openssl_path
26+ local sqlite_path
27+ local openssl_pkg
28+ local sqlite_pkg
29+ openssl_path=$( jq -c ' . | select ( .name == "openssl" ) | .repopath' " ${td} /packagesite/packagesite.yaml" )
30+ sqlite_path=$( jq -c ' . | select ( .name == "sqlite3" ) | .repopath' " ${td} /packagesite/packagesite.yaml" )
31+ openssl_path=${openssl_path// ' "' / }
32+ sqlite_path=${sqlite_path// ' "' / }
33+ openssl_pkg=$( basename " ${openssl_path} " )
34+ sqlite_pkg=$( basename " ${sqlite_path} " )
3135
3236 local target=" ${ARCH} -unknown-freebsd${BSD_MAJOR} "
3337
3438 # Adding openssl lib
35- curl --retry 3 -sSfL " ${pkg_source} /All/openssl- ${openssl_ver} .txz " -O
36- tar -C " ${td} /openssl" -xJf " openssl- ${openssl_ver} .txz " /usr/local/lib /usr/local/include/
39+ curl --retry 3 -sSfL " ${pkg_source} /${openssl_path} " -O
40+ tar -C " ${td} /openssl" -xJf " ${openssl_pkg} " /usr/local/lib /usr/local/include/
3741
3842 # Adding sqlite3
39- curl --retry 3 -sSfL " ${pkg_source} /All/sqlite3- ${sqlite_ver} .txz " -O
40- tar -C " ${td} /sqlite" -xJf " sqlite3- ${sqlite_ver} .txz " /usr/local/lib
43+ curl --retry 3 -sSfL " ${pkg_source} /${sqlite_path} " -O
44+ tar -C " ${td} /sqlite" -xJf " ${sqlite_pkg} " /usr/local/lib
4145
4246 # Copy the linked library
4347 local destdir=" /usr/local/${target} "
0 commit comments