Merge branch 'pkgmk-dl-path'

1 files changed, 9 insertions, 8 deletions

diff --git a/lib/pkg.sh b/lib/pkg.sh
index 9c1a5df..4b17b27 100644
--- a/lib/pkg.sh
+++ b/lib/pkg.sh
@@ -25,20 +25,21 @@ export PORTSDIR=${PORTSDIR:-/usr/ports} # Path to port store
 export PORTTMP=''                       # Path to the port temp dir
 
 function pkg_download_src {
-  local pkgsrc=${1}
-  shift
-  local src=${@}
+  local _port=${1:-}
+  local _pkgsrc=${2:-}
+  shift && shift
+  local _src=${@}
 
   # Download from Pkgfile src spec
-  for file in ${src[@]}; do
+  for file in ${_src[@]}; do
     # If the source file exists locally, just copy from here
     if [[ -f ${file} ]]; then
-      cp -p ${file} ${pkgsrc}
+      cp -p ${file} ${_pkgsrc}
     else
       linfo "Downloading ${file}"
-      download_src ${file} ${pkgsrc}
-      linfo "Extracting $(basename ${file}) to ${pkgsrc}"
-      archive_extract ${pkgsrc}/$(basename ${file}) ${pkgsrc}
+      download_src ${file} ${_port}
+      linfo "Extracting $(basename ${file}) to ${_pkgsrc}"
+      archive_extract ${_port}/$(basename ${file}) ${_pkgsrc}
     fi
   done
 }