build fix

ci/pipelines/fx/ensure_env_version.sh

@@ -1,58 +1,37 @@
 #!/bin/sh
 set -eu
 
-regen_env_version() {
-  echo "[fx-pipeline] regenerating .env.version defaults" >&2
+echo "[fx-pipeline] rewriting .env.version" >&2
 
-  if [ -n "${WOODPECKER_COMMIT:-}" ]; then
-    git_rev="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)"
-  elif command -v git >/dev/null 2>&1; then
-    git_rev="$(git rev-parse --short HEAD 2>/dev/null || echo dev)"
-  else
-    git_rev="dev"
-  fi
+if [ -n "${WOODPECKER_COMMIT:-}" ]; then
+  GIT_REV="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)"
+elif command -v git >/dev/null 2>&1; then
+  GIT_REV="$(git rev-parse --short HEAD 2>/dev/null || echo dev)"
+else
+  GIT_REV="dev"
+fi
 
-  if [ -n "${WOODPECKER_BRANCH:-}" ]; then
-    branch="${WOODPECKER_BRANCH}"
-  elif command -v git >/dev/null 2>&1; then
-    branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)"
-  else
-    branch="local"
-  fi
+if [ -n "${WOODPECKER_BRANCH:-}" ]; then
+  BUILD_BRANCH="${WOODPECKER_BRANCH}"
+elif command -v git >/dev/null 2>&1; then
+  BUILD_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)"
+else
+  BUILD_BRANCH="local"
+fi
 
-  if [ -f version ]; then
-    app_v="$(cat version 2>/dev/null || echo dev)"
-  else
-    app_v="dev"
-  fi
+if [ -f version ]; then
+  APP_V="$(cat version 2>/dev/null || echo dev)"
+else
+  APP_V="dev"
+fi
 
-  build_date="$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo unknown)"
-  build_user="${WOODPECKER_MACHINE:-woodpecker}"
+BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || echo unknown)"
+BUILD_USER="${WOODPECKER_MACHINE:-woodpecker}"
 
-  printf "GIT_REV=%s\nBUILD_BRANCH=%s\nAPP_V=%s\nBUILD_DATE=%s\nBUILD_USER=%s\n" \
-    "$git_rev" "$branch" "$app_v" "$build_date" "$build_user" > .env.version
-}
-
-ensure_env_version() {
-  if [ ! -s ./.env.version ]; then
-    regen_env_version
-    return
-  fi
-
-  tmp=".env.version.$$.tmp"
-  if ! grep -E '^[[:space:]]*[A-Za-z_][A-Za-z0-9_]*=' ./.env.version >"$tmp"; then
-    rm -f "$tmp"
-    regen_env_version
-    return
-  fi
-
-  if [ ! -s "$tmp" ]; then
-    rm -f "$tmp"
-    regen_env_version
-    return
-  fi
-
-  mv "$tmp" ./.env.version
-}
-
-ensure_env_version
+cat > .env.version <<EOF
+GIT_REV=${GIT_REV}
+BUILD_BRANCH=${BUILD_BRANCH}
+APP_V=${APP_V}
+BUILD_DATE=${BUILD_DATE}
+BUILD_USER=${BUILD_USER}
+EOF