siivous: scriptit env-pohjaisiksi, validointi, siistit kutsut

scripts/publish-git-pages.sh

@@ -2,23 +2,20 @@
 set -euo pipefail
 
 SUITE_PATH="${1:-}"
-PAGES_HOST="${2:-}"
-GIT_PAGES_PUBLISH_URL="${3:-}"
-GIT_PAGES_PUBLISH_TOKEN="${4:-}"
-GIT_PAGES_PUBLISH_USER="${5:-publish}"
-REPO_SLUG="${GITHUB_REPOSITORY:-}"
 
 [ -n "$SUITE_PATH" ] || { echo "ERROR: suite_path argument required" >&2; exit 1; }
-[ -n "$PAGES_HOST" ] || { echo "ERROR: pages_host argument is required" >&2; exit 1; }
-[ -n "$GIT_PAGES_PUBLISH_URL" ] || { echo "ERROR: publish_url argument is required" >&2; exit 1; }
-[ -n "$GIT_PAGES_PUBLISH_TOKEN" ] || { echo "ERROR: publish_token argument is required" >&2; exit 1; }
-[ -n "$REPO_SLUG" ] || { echo "ERROR: GITHUB_REPOSITORY is not set" >&2; exit 1; }
+[ -n "${GITEA_API_URL:-}" ] || { echo "ERROR: GITEA_API_URL is not set" >&2; exit 1; }
+[ -n "${PAGES_HOST:-}" ] || { echo "ERROR: PAGES_HOST is not set" >&2; exit 1; }
+[ -n "${GIT_PAGES_PUBLISH_URL:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_URL is not set" >&2; exit 1; }
+[ -n "${GIT_PAGES_PUBLISH_TOKEN:-}" ] || { echo "ERROR: GIT_PAGES_PUBLISH_TOKEN is not set" >&2; exit 1; }
+[ -n "${GITHUB_REPOSITORY:-}" ] || { echo "ERROR: GITHUB_REPOSITORY is not set" >&2; exit 1; }
 [ -n "${GITHUB_SHA:-}" ] || { echo "ERROR: GITHUB_SHA is not set" >&2; exit 1; }
 
-OWNER="${REPO_SLUG%%/*}"
-REPO="${REPO_SLUG##*/}"
+OWNER="${GITHUB_REPOSITORY%%/*}"
+REPO="${GITHUB_REPOSITORY##*/}"
 SHA8="${GITHUB_SHA:0:8}"
-REPORT_DIR="reports/${SHA8}/${SUITE_PATH}"
+PAGES_USER="${GIT_PAGES_PUBLISH_USER:-publish}"
+REPORT_DIR="reports/${SHA8}/${SUITE_PATH%/}"
 REPORT_BASE="https://${PAGES_HOST}/${OWNER}/${REPO}/reports/${SHA8}"
 
 [ -d "$REPORT_DIR" ] || { echo "ERROR: not a directory: $REPORT_DIR" >&2; exit 1; }
@@ -46,7 +43,7 @@ find "$WORK/$OWNER" \( -type f -o -type l \) -print | sed "s|^${WORK}/||" | tar
 publish() {
   local method="$1"
   curl -sS -X "$method" "$PUBLISH_SITE_URL" \
-    -u "${GIT_PAGES_PUBLISH_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
+    -u "${PAGES_USER}:${GIT_PAGES_PUBLISH_TOKEN}" \
     -H "Content-Type: application/x-tar" \
     -H "Atomic: no" \
     -H "Create-Parents: yes" \