dep

commit f5827d67d04c59cbc63efb23f18f33de8f4b0387
parent c7f88c7994c13a235d8553050eab0c49a37b79e0
Author: finwo <finwo@pm.me>
Date:   Sat, 28 Jan 2023 17:32:20 +0100

Made src-sha256 in package.ini optional

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

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dist/dep b/dist/dep
@@ -278,9 +278,8 @@ function cmd_install_dep {
     curl --location --progress-bar "${origin}" --output "${CMD_INSTALL_PKG_DEST}/${name}/package.ini"
 
     # Fetch it's src (if present)
-    if [ ! -z "$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src)" ]; then
-      SRC="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src)"
-      HASH="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src-sha256)"
+    SRC="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src)"
+    if [ ! -z "${SRC}" ]; then
 
       # Download
       mkdir -p "${CMD_INSTALL_PKG_DEST}/.dep/cache/${name}"
@@ -289,7 +288,8 @@ function cmd_install_dep {
       fi
 
       # Verify checksum
-      if [ "${HASH}" != "$(sha256sum "${CMD_INSTALL_PKG_DEST}/.dep/cache/${name}/tarball" | awk '{print $1}')" ]; then
+      HASH="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src-sha256)"
+      if [ ! -z "${HASH}" ] && [ "${HASH}" != "$(sha256sum "${CMD_INSTALL_PKG_DEST}/.dep/cache/${name}/tarball" | awk '{print $1}')" ]; then
         echo "The tarball for '${name}' failed it's checksum!" >&2
         exit 1
       fi
diff --git a/src/command/install/index.sh b/src/command/install/index.sh
@@ -79,9 +79,8 @@ function cmd_install_dep {
     curl --location --progress-bar "${origin}" --output "${CMD_INSTALL_PKG_DEST}/${name}/package.ini"
 
     # Fetch it's src (if present)
-    if [ ! -z "$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src)" ]; then
-      SRC="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src)"
-      HASH="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src-sha256)"
+    SRC="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src)"
+    if [ ! -z "${SRC}" ]; then
 
       # Download
       mkdir -p "${CMD_INSTALL_PKG_DEST}/.__NAME/cache/${name}"
@@ -90,7 +89,8 @@ function cmd_install_dep {
       fi
 
       # Verify checksum
-      if [ "${HASH}" != "$(sha256sum "${CMD_INSTALL_PKG_DEST}/.__NAME/cache/${name}/tarball" | awk '{print $1}')" ]; then
+      HASH="$(ini_foreach ini_output_value "${CMD_INSTALL_PKG_DEST}/${name}/package.ini" package.src-sha256)"
+      if [ ! -z "${HASH}" ] && [ "${HASH}" != "$(sha256sum "${CMD_INSTALL_PKG_DEST}/.__NAME/cache/${name}/tarball" | awk '{print $1}')" ]; then
         echo "The tarball for '${name}' failed it's checksum!" >&2
         exit 1
       fi