commit c966e8c011fe45de3a902972aebc09503bfdcebb parent 9ef643b0831d6faf897f4fd7555d1af2e4350986 Author: finwo <finwo@pm.me> Date: Sat, 28 Jan 2023 16:36:37 +0100 Use symlinks instead of rendered files for exports Diffstat:
| M | dist/dep | | | 17 | +++++++++-------- |
| D | scripts/install.sh | | | 4 | ---- |
| M | src/command/install/index.sh | | | 17 | +++++++++-------- |
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/dist/dep b/dist/dep @@ -324,20 +324,21 @@ 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 + # # 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}")" - cat "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" | \ - sed "s|${DIRKEY}|${CMD_INSTALL_PKG_DEST}/${name}|g" \ - >> "${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}" done < <(ini_foreach ini_output_section "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" "export.") } diff --git a/scripts/install.sh b/scripts/install.sh @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -curl --location https://raw.githubusercontent.com/finwo/dep/master/dist/dep --output /usr/local/bin/dep -chmod +x /usr/local/bin/dep diff --git a/src/command/install/index.sh b/src/command/install/index.sh @@ -125,19 +125,20 @@ 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 + # # 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}")" - cat "${CMD_INSTALL_PKG_DEST}/${name}/${filesource}" | \ - sed "s|${DIRKEY}|${CMD_INSTALL_PKG_DEST}/${name}|g" \ - >> "${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}" done < <(ini_foreach ini_output_section "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" "export.") }