Commit 58a7ee7e3ae24eb60774c9aeb5ab2ca1f6ee73ca
2023-01-25T19:03:40
system_packages
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/share/shpkg/FreeBSD/system_packages b/share/shpkg/FreeBSD/system_packages
new file mode 100644
index 0000000..ff26996
--- /dev/null
+++ b/share/shpkg/FreeBSD/system_packages
@@ -0,0 +1,2 @@
+freedesktop.org/libbsd
+hadrons.org/libmd
diff --git a/share/shpkg/OpenBSD/system_packages b/share/shpkg/OpenBSD/system_packages
new file mode 100644
index 0000000..ff26996
--- /dev/null
+++ b/share/shpkg/OpenBSD/system_packages
@@ -0,0 +1,2 @@
+freedesktop.org/libbsd
+hadrons.org/libmd
diff --git a/share/shpkg/shpkg.subr b/share/shpkg/shpkg.subr
index 572c6d8..a420ee8 100644
--- a/share/shpkg/shpkg.subr
+++ b/share/shpkg/shpkg.subr
@@ -302,30 +302,32 @@ shpkg__tag_write() {
shpkg_install () {
for REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${REPO}")"
- SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
- SHPKG_REPO_PACKAGE="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.tgz"
- SHPKG_REPO_INSTALLED="${SHPKG_VAR_DB_DIR}/installed/${SHPKG_REPO_DIR}"
- SHPKG_REPO_INSTALLED_DIR="$(dirname "${SHPKG_REPO_INSTALLED}")"
- if ! [ -f "${SHPKG_REPO_INSTALLED}" ] ||
- ! head -n 1 < "${SHPKG_REPO_INSTALLED}" |
- grep "Version: ${SHPKG_REPO_VERSION}" >/dev/null; then
- ( verbose shpkg_install_dependencies "${REPO}"; )
- ( verbose shpkg_build "${REPO}"; )
- ( verbose shpkg_package "${REPO}"; )
+ if ! grep -Eq "^${SHPKG_REPO_DIR}\$" "${SHPKG_OS_DIR}/system_packages"; then
SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
SHPKG_REPO_PACKAGE="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.tgz"
- SHPKG_REPO_PACKAGE_CHECKSUM="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.SHA256"
- ( verbose cd "${SHPKG_DIR}" &&
- echo "pax -rdz < ${SHPKG_REPO_PACKAGE}" &&
- pax -rdz < "${SHPKG_REPO_PACKAGE}"; )
- if ! [ -d "${SHPKG_REPO_INSTALLED_DIR}" ]; then
- verbose mkdir -p "${SHPKG_REPO_INSTALLED_DIR}"
+ SHPKG_REPO_INSTALLED="${SHPKG_VAR_DB_DIR}/installed/${SHPKG_REPO_DIR}"
+ SHPKG_REPO_INSTALLED_DIR="$(dirname "${SHPKG_REPO_INSTALLED}")"
+ if ! [ -f "${SHPKG_REPO_INSTALLED}" ] ||
+ ! head -n 1 < "${SHPKG_REPO_INSTALLED}" |
+ grep "Version: ${SHPKG_REPO_VERSION}" >/dev/null; then
+ ( verbose shpkg_install_dependencies "${REPO}"; )
+ ( verbose shpkg_build "${REPO}"; )
+ ( verbose shpkg_package "${REPO}"; )
+ SHPKG_REPO_VERSION="$(shpkg_version "${REPO}")"
+ SHPKG_REPO_PACKAGE="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.tgz"
+ SHPKG_REPO_PACKAGE_CHECKSUM="${SHPKG_PACKAGE_DIR}/${SHPKG_REPO_DIR}-${SHPKG_REPO_VERSION}.SHA256"
+ ( verbose cd "${SHPKG_DIR}" &&
+ echo "pax -rdz < ${SHPKG_REPO_PACKAGE}" &&
+ pax -rdz < "${SHPKG_REPO_PACKAGE}"; )
+ if ! [ -d "${SHPKG_REPO_INSTALLED_DIR}" ]; then
+ verbose mkdir -p "${SHPKG_REPO_INSTALLED_DIR}"
+ fi
+ echo "echo Version: ${SHPKG_REPO_VERSION} > ${SHPKG_REPO_INSTALLED}"
+ echo "Version: ${SHPKG_REPO_VERSION}" > "${SHPKG_REPO_INSTALLED}"
+ echo "cat ${SHPKG_REPO_PACKAGE_CHECKSUM} >> ${SHPKG_REPO_INSTALLED}"
+ cat "${SHPKG_REPO_PACKAGE_CHECKSUM}" >> "${SHPKG_REPO_INSTALLED}"
fi
- echo "echo Version: ${SHPKG_REPO_VERSION} > ${SHPKG_REPO_INSTALLED}"
- echo "Version: ${SHPKG_REPO_VERSION}" > "${SHPKG_REPO_INSTALLED}"
- echo "cat ${SHPKG_REPO_PACKAGE_CHECKSUM} >> ${SHPKG_REPO_INSTALLED}"
- cat "${SHPKG_REPO_PACKAGE_CHECKSUM}" >> "${SHPKG_REPO_INSTALLED}"
- fi
+ fi
done
}