From e84dca5efa68f799d3d6c724d6e3a9d00a38731b Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Thu, 30 Apr 2026 14:35:57 +0200 Subject: [PATCH] fix(invidious): strip git invocations from invidious.cr before make --- ct/invidious.sh | 9 +++++++++ install/invidious-install.sh | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/ct/invidious.sh b/ct/invidious.sh index df12b0fd..7efdf7ec 100644 --- a/ct/invidious.sh +++ b/ct/invidious.sh @@ -46,6 +46,15 @@ function update_script() { msg_info "Rebuilding Invidious" cd /opt/invidious + INVIDIOUS_VERSION="$(cat ~/.Invidious 2>/dev/null || echo "unknown")" + INVIDIOUS_VERSION="${INVIDIOUS_VERSION#v}" + sed -i \ + -e "s|CURRENT_BRANCH = {{ \"#{\`git branch | sed -n '/\* /s///p'\`.strip}\" }}|CURRENT_BRANCH = \"master\"|" \ + -e "s|CURRENT_COMMIT = {{ \"#{\`git rev-list HEAD --max-count=1 --abbrev-commit\`.strip}\" }}|CURRENT_COMMIT = \"\"|" \ + -e "s|CURRENT_VERSION = {{ \"#{\`git log -1 --format=%ci | awk '{print \$1}' | sed s/-/./g\`.strip}\" }}|CURRENT_VERSION = \"${INVIDIOUS_VERSION}\"|" \ + -e "s|CURRENT_TAG = {{ \"#{\`git tag --points-at HEAD\`.strip}\" }}|CURRENT_TAG = \"${INVIDIOUS_VERSION}\"|" \ + -e "s|ASSET_COMMIT = {{ \"#{\`git rev-list HEAD --max-count=1 --abbrev-commit -- assets\`.strip}\" }}|ASSET_COMMIT = \"\"|" \ + src/invidious.cr $STD make msg_ok "Rebuilt Invidious" diff --git a/install/invidious-install.sh b/install/invidious-install.sh index e88b12d6..28d5df74 100644 --- a/install/invidious-install.sh +++ b/install/invidious-install.sh @@ -40,6 +40,15 @@ fetch_and_deploy_gh_release "Invidious Companion" "iv-org/invidious-companion" " msg_info "Building Invidious" cd /opt/invidious +INVIDIOUS_VERSION="$(cat ~/.Invidious 2>/dev/null || echo "unknown")" +INVIDIOUS_VERSION="${INVIDIOUS_VERSION#v}" +sed -i \ + -e "s|CURRENT_BRANCH = {{ \"#{\`git branch | sed -n '/\* /s///p'\`.strip}\" }}|CURRENT_BRANCH = \"master\"|" \ + -e "s|CURRENT_COMMIT = {{ \"#{\`git rev-list HEAD --max-count=1 --abbrev-commit\`.strip}\" }}|CURRENT_COMMIT = \"\"|" \ + -e "s|CURRENT_VERSION = {{ \"#{\`git log -1 --format=%ci | awk '{print \$1}' | sed s/-/./g\`.strip}\" }}|CURRENT_VERSION = \"${INVIDIOUS_VERSION}\"|" \ + -e "s|CURRENT_TAG = {{ \"#{\`git tag --points-at HEAD\`.strip}\" }}|CURRENT_TAG = \"${INVIDIOUS_VERSION}\"|" \ + -e "s|ASSET_COMMIT = {{ \"#{\`git rev-list HEAD --max-count=1 --abbrev-commit -- assets\`.strip}\" }}|ASSET_COMMIT = \"\"|" \ + src/invidious.cr $STD make msg_ok "Built Invidious"