From 07ae43d17e20686292fc9dba167047bd658d1b0f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 00:08:04 +0200 Subject: [PATCH 1/4] first check --- spcd.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spcd.sh b/spcd.sh index bb49c9b..7714c83 100644 --- a/spcd.sh +++ b/spcd.sh @@ -42,6 +42,8 @@ spcd_main() { spcd_set_environment_variables() { spcd_step "Set environment variables" + # check script first + [ -n "${SPCD}" ] || spcd_error_ci "SPCD" # continuous integration / github → gitea → forgejo if [ -n "${GITHUB_ACTIONS}" ]; then # project branch From b2e90ddd43288c075b6029e213578e7b125c3924 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 00:18:10 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=E2=86=93=20&=20split?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spcd.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spcd.sh b/spcd.sh index 7714c83..f4431d5 100644 --- a/spcd.sh +++ b/spcd.sh @@ -710,8 +710,17 @@ ${spcd_ipm__url} "${spcd_ipm__url}" \ "${spcd_ipm__root}/${spcd_ipm__name}" || exit + spcd_ipm__path="${spcd_ipm__root}/${spcd_ipm__name}/${spcd_ipm__name}" + echo "\ +${spcd_ipm__path} +↓ +${SPCD_PYTHON_PACKAGES}" + cp --recursive "${spcd_ipm__path}" "${SPCD_PYTHON_PACKAGES}" || + exit + # check matching of file and variable spcd_ipm__script="${spcd_ipm__root}/${spcd_ipm__name}/spcd.sh" if [ -f "${spcd_ipm__script}" ]; then + spcd_split spcd_ipm__file="${spcd_ipm__root}/spcd.sh" printf "%s" "${SPCD}" >"${spcd_ipm__file}" ls -l "${spcd_ipm__file}" @@ -720,13 +729,6 @@ ${spcd_ipm__url} sha256sum "${spcd_ipm__file}" sha256sum "${spcd_ipm__script}" fi - spcd_ipm__path="${spcd_ipm__root}/${spcd_ipm__name}/${spcd_ipm__name}" - echo "\ -${spcd_ipm__path} -↓ -${SPCD_PYTHON_PACKAGES}" - cp --recursive "${spcd_ipm__path}" "${SPCD_PYTHON_PACKAGES}" || - exit done spcd_split spcd_ls "${SPCD_PYTHON_PACKAGES}" From 6f6fc9d061e59220775a9bf7708d664253331e5d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 00:18:51 +0200 Subject: [PATCH 3/4] sha512sum --- spcd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spcd.sh b/spcd.sh index f4431d5..e7c4f6a 100644 --- a/spcd.sh +++ b/spcd.sh @@ -726,8 +726,8 @@ ${SPCD_PYTHON_PACKAGES}" ls -l "${spcd_ipm__file}" dos2unix "${spcd_ipm__file}" ls -l "${spcd_ipm__file}" - sha256sum "${spcd_ipm__file}" - sha256sum "${spcd_ipm__script}" + sha512sum "${spcd_ipm__file}" + sha512sum "${spcd_ipm__script}" fi done spcd_split From b450c9534c622d4ecc233ea1241ba76954eb999b Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Tue, 30 Jul 2024 00:29:45 +0200 Subject: [PATCH 4/4] check matching --- readme.md | 1 - spcd.sh | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/readme.md b/readme.md index 96dd8ef..6a0a809 100644 --- a/readme.md +++ b/readme.md @@ -103,5 +103,4 @@ from various contexts of CA, CI and OCI / OS. ### .sh -* check if file & variable match * support opensuse diff --git a/spcd.sh b/spcd.sh index e7c4f6a..32be9e9 100644 --- a/spcd.sh +++ b/spcd.sh @@ -721,13 +721,13 @@ ${SPCD_PYTHON_PACKAGES}" spcd_ipm__script="${spcd_ipm__root}/${spcd_ipm__name}/spcd.sh" if [ -f "${spcd_ipm__script}" ]; then spcd_split - spcd_ipm__file="${spcd_ipm__root}/spcd.sh" - printf "%s" "${SPCD}" >"${spcd_ipm__file}" - ls -l "${spcd_ipm__file}" - dos2unix "${spcd_ipm__file}" - ls -l "${spcd_ipm__file}" - sha512sum "${spcd_ipm__file}" - sha512sum "${spcd_ipm__script}" + spcd_ipm__check="${spcd_ipm__root}/check.sha512sum" + sha512sum "${spcd_ipm__script}" > "${spcd_ipm__check}" + printf "%s" "${SPCD}" >"${spcd_ipm__script}" + ls -l "${spcd_ipm__script}" + dos2unix "${spcd_ipm__script}" + ls -l "${spcd_ipm__script}" + sha512sum -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" fi done spcd_split