Merge branch 'pkgmk-cleanup'

2 files changed, 42 insertions, 29 deletions

diff --git a/bin/pkgimg.sh b/bin/pkgimg.sh
index 25afe11..462c0e1 100755
--- a/bin/pkgimg.sh
+++ b/bin/pkgimg.sh
@@ -32,48 +32,53 @@ export KEEP_BUILD=${KEEP_BUILD:-0}
 function main {
   local manifest=${1:-}
 
-  local installbase=''
+  local _installbase # Path to the temporary image working directory
+  local _porttmp     # Path to the temporary package working directory
 
-  if [[ -z ${manifest} ]]; then
-    lerror "Please provide a port manifest."
+  if [[ -z "${manifest}" ]]; then
+    lerror "Please specify a port manifest."
     return 1
   fi
+  if [[ ! -f "${manifest}" ]]; then
+    lerror "Path '${manifest}' does not exist or is not a manifest"
+    return 2
+  fi
 
   # Convert portsdir to absolute path
   PORTSDIR="$(cd ${PORTSDIR} && pwd)"
 
-  installbase=$(mktemp -d /tmp/pkgimg-install.XXXX)
+  _installbase=$(mktemp -d /tmp/pkgimg-install.XXXX)
 
   # Loop over each port in the manifest
   for port in $(grep -v '^#' ${manifest} | grep -v '^[ 	]*$'); do
     # Call pkgmk to build the port
-    pkgmk ${port}
+    pkgmk ${port} '_porttmp'
     [ $? -gt 0 ] && return 1
 
     # Move the package contents to the install base
-    linfo "Synchronizing ${port} build to install base ${installbase}"
-    rsync -a ${PORTTMP}/pkg/ ${installbase}/
+    linfo "Synchronizing ${port} build to install base ${_installbase}"
+    rsync -a ${_porttmp}/pkg/ ${_installbase}/
 
     # Cleanup
     if [ "${KEEP_BUILD}" = 0 ]; then
-      rm -rf ${PORTTMP}
+      rm -rf ${_porttmp}
     else
       linfo "KEEP_BUILD is set. Skipping cleanup of ${port}."
     fi
   done
 
-  linfo "Generating footprint file for ${installbase}"
-  footprint_dir ${installbase} > ${installbase}.footprint
+  linfo "Generating footprint file for ${_installbase}"
+  footprint_dir ${_installbase} > ${_installbase}.footprint
 
-  linfo "Creating deployment tarball from ${installbase}"
-  tar -cf ${installbase}.tar -C ${installbase} ./*
+  linfo "Creating deployment tarball from ${_installbase}"
+  tar -cf ${_installbase}.tar -C ${_installbase} ./*
 
-  linfo "Compressing ${installbase}.tar"
-  xz -v ${installbase}.tar
+  linfo "Compressing ${_installbase}.tar"
+  xz -v ${_installbase}.tar
 
-  linfo "Fakeroot filesystem: ${installbase}"
-  linfo "Deployment tarball:  ${installbase}.tar.xz"
-  linfo "Tarball footprint:   ${installbase}.footprint"
+  linfo "Fakeroot filesystem: ${_installbase}"
+  linfo "Deployment tarball:  ${_installbase}.tar.xz"
+  linfo "Tarball footprint:   ${_installbase}.footprint"
 }
 
 main ${@}
diff --git a/lib/pkg.sh b/lib/pkg.sh
index 2a5047a..aa6063e 100644
--- a/lib/pkg.sh
+++ b/lib/pkg.sh
@@ -53,37 +53,45 @@ function pkg_download_src {
 # TODO: Describe this
 #
 function pkgmk {
-  local port=${1:-}
+  local _port=${1:-}
+  local _ref_porttmp=${2:-}
 
-  local PKG=''     # Path to the port pkg dir (binary install dest)
-  local PKGSRC=''  # Path to the port src dir
+  local _retval  # Return value variable
+  local _tmpdir  # Temporary working directory to build the pkg
+  # NOTE: These are "global", so the Pkgfile can access them
+  local PKG      # Path to the port pkg dir (binary install dest)
+  local PKGSRC   # Path to the port src dir
 
   # Change context to port dir
-  cd ${PORTSDIR}/${port}
+  cd ${PORTSDIR}/${_port}
 
   # Include the port Pkgfile
   source Pkgfile
   
   # Create the port build and install directory structure
-  PORTTMP=$(mktemp -d /tmp/pkgmk-${port}.XXXX)
-  PKGSRC=${PORTTMP}/src
-  PKG=${PORTTMP}/pkg
+  _tmpdir=$(mktemp -d /tmp/pkgmk-${_port}.XXXX)
+  PKGSRC=${_tmpdir}/src
+  PKG=${_tmpdir}/pkg
   mkdir -p {${PKGSRC},${PKG}}
 
   # Download the package source files
-  pkg_download_src "${PORTSDIR}/${port}" "${PKGSRC}" "${source[@]}"
+  pkg_download_src "${PORTSDIR}/${_port}" "${PKGSRC}" "${source[@]}"
 
   cd ${PKGSRC}
 
   # Call the build process if defined
   if [[ $(type -t pkgbuild) == 'function' ]]; then
-    linfo "Running ${port} build process"
+    linfo "Running ${_port} build process"
     pkgbuild
-    return $?
+    _retval=$?
+
+    # Set the pkg temp dir (this is our return value)
+    eval "${_ref_porttmp}=${_tmpdir}"
+    return ${_retval}
   else
-    lerror "Port ${port} has no pkgbuild function. Aborting."
+    lerror "Port ${_port} has no pkgbuild function. Aborting."
     return 1
   fi
 
-  return 0
+  return 1
 }