Commit 159e306ec2a0fba285682b3b94ecd65716c0d0ef
2023-02-14T13:55:22
SHPKG_TARGET -> SHPKG_OS
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
diff --git a/bin/shpkg_ci b/bin/shpkg_ci
index fa7afeb..5d9c009 100755
--- a/bin/shpkg_ci
+++ b/bin/shpkg_ci
@@ -9,23 +9,23 @@ set -e
shpkg_lock shpkg_ci.lock
logs2html () (
- cd ~/"www/log/${SHPKG_TARGET}/txt"
+ cd ~/"www/log/${SHPKG_OS}/txt"
for F in "${SHPKG_REPO}".*.log; do
if [ "$F" -nt "../html/$F.html" ]; then
verbose 1 ansi2html "$F"
fi
done
- verbose 1 mv ~/www/log/"${SHPKG_TARGET}"/txt/*.html ~/www/log/"${SHPKG_TARGET}"/html/ || true
+ verbose 1 mv ~/www/log/"${SHPKG_OS}"/txt/*.html ~/www/log/"${SHPKG_OS}"/html/ || true
)
main () {
verbose 2 shpkg_config
SHPKG_CI_STATUS=0
- if ! [ -d ~/"www/log/${SHPKG_TARGET}/txt" ]; then
- verbose 1 mkdir -p ~/"www/log/${SHPKG_TARGET}/txt"
+ if ! [ -d ~/"www/log/${SHPKG_OS}/txt" ]; then
+ verbose 1 mkdir -p ~/"www/log/${SHPKG_OS}/txt"
fi
- if ! [ -d ~/"www/log/${SHPKG_TARGET}/html" ]; then
- verbose 1 mkdir -p ~/"www/log/${SHPKG_TARGET}/html"
+ if ! [ -d ~/"www/log/${SHPKG_OS}/html" ]; then
+ verbose 1 mkdir -p ~/"www/log/${SHPKG_OS}/html"
fi
for SHPKG_REPO; do
SHPKG_REPO_DIR="$(shpkg_dir "${SHPKG_REPO}")"
@@ -42,7 +42,7 @@ main () {
if ! verbose 2 shpkg upgrade "${SHPKG_REPO}"; then
SHPKG_CI_STATUS=10
fi; )
- if verbose 1 cp -p ~/"shpkg_${SHPKG_REPO}/var/log/shpkg/tags/${SHPKG_REPO}".*.log ~/"www/log/${SHPKG_TARGET}/txt"; then
+ if verbose 1 cp -p ~/"shpkg_${SHPKG_REPO}/var/log/shpkg/tags/${SHPKG_REPO}".*.log ~/"www/log/${SHPKG_OS}/txt"; then
verbose 2 logs2html
fi
fi
@@ -52,10 +52,10 @@ main () {
SHPKG_CI_STATUS=10
fi; )
SHPKG_CI_COPY=No
- if verbose 1 cp -p ~/"shpkg_${SHPKG_REPO}/var/log/shpkg/tags/${SHPKG_REPO}".*.log ~/"www/log/${SHPKG_TARGET}/txt"; then
+ if verbose 1 cp -p ~/"shpkg_${SHPKG_REPO}/var/log/shpkg/tags/${SHPKG_REPO}".*.log ~/"www/log/${SHPKG_OS}/txt"; then
SHPKG_CI_COPY=Yes
fi
- if verbose 1 cp -p ~/"shpkg/var/log/shpkg/tags/${SHPKG_REPO}.ci.log" ~/"www/log/${SHPKG_TARGET}/txt"; then
+ if verbose 1 cp -p ~/"shpkg/var/log/shpkg/tags/${SHPKG_REPO}.ci.log" ~/"www/log/${SHPKG_OS}/txt"; then
SHPKG_CI_COPY=Yes
fi
if [ "x${SHPKG_CI_COPY}" = "xYes" ]; then