commit 9250e620d5817d947def1934ae976652e6ad534b
parent d17fb4addf06c837547ea13e6b744686a9d6df93
Author: finwo <finwo@pm.me>
Date: Sat, 27 Apr 2024 20:37:54 +0200
Less agressive reset upon consecutive install calls
Diffstat:
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dist/dep b/dist/dep
@@ -284,11 +284,11 @@ function cmd_install {
CMD_INSTALL_PKG_DEST=$(ini_foreach ini_output_value "${PACKAGE_PATH}" "package.deps")
if [ -z "${CMD_INSTALL_PKG_DEST}" ]; then CMD_INSTALL_PKG_DEST="lib"; fi
- # Reset working directory
- rm -rf "${CMD_INSTALL_PKG_DEST}/.dep"
+ # Reset working directory - keep cache
+ rm -fr "${CMD_INSTALL_PKG_DEST}/.dep/include"
mkdir -p "${CMD_INSTALL_PKG_DEST}/.dep/include"
echo "INCLUDES+=-I${CMD_INSTALL_PKG_DEST}/.dep/include" > "${CMD_INSTALL_PKG_DEST}/.dep/config.mk"
- echo "" > "${CMD_INSTALL_PKG_DEST}/.dep/exported"
+ echo -n "" > "${CMD_INSTALL_PKG_DEST}/.dep/exported"
# Install all dependencies
ini_foreach cmd_install_parse_ini "${PACKAGE_PATH}"
diff --git a/src/command/install/index.sh b/src/command/install/index.sh
@@ -33,11 +33,11 @@ function cmd_install {
CMD_INSTALL_PKG_DEST=$(ini_foreach ini_output_value "${PACKAGE_PATH}" "package.deps")
if [ -z "${CMD_INSTALL_PKG_DEST}" ]; then CMD_INSTALL_PKG_DEST="lib"; fi
- # Reset working directory
- rm -rf "${CMD_INSTALL_PKG_DEST}/.__NAME"
+ # Reset working directory - keep cache
+ rm -fr "${CMD_INSTALL_PKG_DEST}/.__NAME/include"
mkdir -p "${CMD_INSTALL_PKG_DEST}/.__NAME/include"
echo "INCLUDES+=-I${CMD_INSTALL_PKG_DEST}/.__NAME/include" > "${CMD_INSTALL_PKG_DEST}/.__NAME/config.mk"
- echo "" > "${CMD_INSTALL_PKG_DEST}/.__NAME/exported"
+ echo -n "" > "${CMD_INSTALL_PKG_DEST}/.__NAME/exported"
# Install all dependencies
ini_foreach cmd_install_parse_ini "${PACKAGE_PATH}"