dep

commit c15c0d9521e687d18e7206c2f3f8f80bf4a74280
parent c966e8c011fe45de3a902972aebc09503bfdcebb
Author: finwo <finwo@pm.me>
Date:   Sat, 28 Jan 2023 16:41:10 +0100

Remove commented dirkey implementation

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

2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/dist/dep b/dist/dep
@@ -324,21 +324,12 @@ function cmd_install_dep {
 
   # TODO: handle patching/building here
 
-  # # Fetch directory key for export absolute paths
-  # DIRKEY="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.dirkey)"
-  # if [ -z "${DIRKEY}" ]; then
-  #   DIRKEY=__DIRNAME__
-  # fi
-
   # Build the package's exports
   while read line; do
     filetarget=${line%%=*}
     filesource=${line#*=}
     mkdir -p "$(dirname "${CMD_INSTALL_PKG_DEST}/.dep/${filetarget}")"
-    ln -s "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" "${CMD_INSTALL_PKG_DEST}/.dep/${filetarget}"
-    # cat "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" | \
-    #   sed "s|${DIRKEY}|${CMD_INSTALL_PKG_DEST}/${name}|g" \
-    #   >> "${CMD_INSTALL_PKG_DEST}/.dep/${filetarget}"
+    ln -fs "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" "${CMD_INSTALL_PKG_DEST}/.dep/${filetarget}"
   done < <(ini_foreach ini_output_section "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" "export.")
 }
 
diff --git a/src/command/install/index.sh b/src/command/install/index.sh
@@ -125,20 +125,11 @@ function cmd_install_dep {
 
   # TODO: handle patching/building here
 
-  # # Fetch directory key for export absolute paths
-  # DIRKEY="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.dirkey)"
-  # if [ -z "${DIRKEY}" ]; then
-  #   DIRKEY=__DIRNAME__
-  # fi
-
   # Build the package's exports
   while read line; do
     filetarget=${line%%=*}
     filesource=${line#*=}
     mkdir -p "$(dirname "${CMD_INSTALL_PKG_DEST}/.__NAME/${filetarget}")"
-    ln -s "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" "${CMD_INSTALL_PKG_DEST}/.__NAME/${filetarget}"
-    # cat "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" | \
-    #   sed "s|${DIRKEY}|${CMD_INSTALL_PKG_DEST}/${name}|g" \
-    #   >> "${CMD_INSTALL_PKG_DEST}/.__NAME/${filetarget}"
+    ln -fs "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" "${CMD_INSTALL_PKG_DEST}/.__NAME/${filetarget}"
   done < <(ini_foreach ini_output_section "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" "export.")
 }