dep

commit bf253b87c8679315759c86c6cabf6ff14aece41c
parent 9250e620d5817d947def1934ae976652e6ad534b
Author: finwo <finwo@pm.me>
Date:   Fri, 10 May 2024 23:30:06 +0200

Fix dependency recursion to install dep's deps

Diffstat:
M
dist/dep
 | 
6
+++---
M
src/command/install/index.sh
 | 
6
+++---

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dist/dep b/dist/dep
@@ -345,15 +345,15 @@ function cmd_install_dep {
     exit 1
   fi
 
+  local PKG_DIR="${CMD_INSTALL_PKG_DEST}/${PKGNAME}"
   if [ -d "${PKG_DIR}" ]; then
     # Already installed, just update the pkgini ref
-    PKGINI="${CMF_INSTALL_PKG_DEST}/${PKGNAME}/package.ini"
+    PKGINI="${CMD_INSTALL_PKG_DEST}/${PKGNAME}/package.ini"
   else
     # Not installed yet, fetch code & run build steps
 
     # Copy repository's config for the package
     local PKG_SRC=$(dirname "${PKGINI}")
-    local PKG_DIR="${CMD_INSTALL_PKG_DEST}/${PKGNAME}"
     mkdir -p "$(dirname "${PKG_DIR}")"
     cp -r "${PKG_SRC}" "$(dirname ${PKG_DIR})"
     PKGINI="${PKG_DIR}/package.ini"
@@ -387,7 +387,7 @@ function cmd_install_dep {
       tar --extract --directory "${PKG_DIR}/" --strip-components 1 --file="${TARBALL_FILE}"
     fi
 
-    # Handle any global build-steps defined in the package.ini
+    # Install this dependency's dependencies
     while read line; do
       depname=${line%%=*}
       depver=${line#*=}
diff --git a/src/command/install/index.sh b/src/command/install/index.sh
@@ -94,15 +94,15 @@ function cmd_install_dep {
     exit 1
   fi
 
+  local PKG_DIR="${CMD_INSTALL_PKG_DEST}/${PKGNAME}"
   if [ -d "${PKG_DIR}" ]; then
     # Already installed, just update the pkgini ref
-    PKGINI="${CMF_INSTALL_PKG_DEST}/${PKGNAME}/package.ini"
+    PKGINI="${CMD_INSTALL_PKG_DEST}/${PKGNAME}/package.ini"
   else
     # Not installed yet, fetch code & run build steps
 
     # Copy repository's config for the package
     local PKG_SRC=$(dirname "${PKGINI}")
-    local PKG_DIR="${CMD_INSTALL_PKG_DEST}/${PKGNAME}"
     mkdir -p "$(dirname "${PKG_DIR}")"
     cp -r "${PKG_SRC}" "$(dirname ${PKG_DIR})"
     PKGINI="${PKG_DIR}/package.ini"
@@ -136,7 +136,7 @@ function cmd_install_dep {
       tar --extract --directory "${PKG_DIR}/" --strip-components 1 --file="${TARBALL_FILE}"
     fi
 
-    # Handle any global build-steps defined in the package.ini
+    # Install this dependency's dependencies
     while read line; do
       depname=${line%%=*}
       depver=${line#*=}