From 614e1b48107f33fd38df95cd7a95e87fd887cb29 Mon Sep 17 00:00:00 2001 From: sheikhlimon Date: Fri, 13 Feb 2026 17:11:25 +0600 Subject: [PATCH] update script and remove patch --- tailwind-fix.patch | 24 ------------- update-goose-pkgbuild.sh | 75 +++++++++++++++++++++++++++++----------- 2 files changed, 54 insertions(+), 45 deletions(-) delete mode 100644 tailwind-fix.patch diff --git a/tailwind-fix.patch b/tailwind-fix.patch deleted file mode 100644 index a3d55e21f554..000000000000 --- a/tailwind-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 578dc5a88d27a8757bc9a7ebab219f7c89bf3349 Mon Sep 17 00:00:00 2001 -From: Sheikh Limon -Date: Tue, 3 Feb 2026 22:11:12 +0600 -Subject: [PATCH] fix: broken Tailwind scan in tarball releases (#6917) - -Signed-off-by: sheikhlimon ---- - ui/desktop/src/styles/main.css | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ui/desktop/src/styles/main.css b/ui/desktop/src/styles/main.css -index eeb6d3392911..6829376dc02b 100644 ---- a/ui/desktop/src/styles/main.css -+++ b/ui/desktop/src/styles/main.css -@@ -2,6 +2,9 @@ - @import 'tw-animate-css'; - @plugin '@tailwindcss/typography'; - -+@source '../../index.html'; -+@source '../**/*.{js,ts,jsx,tsx}'; -+ - @theme { - --breakpoint-md: 930px; - } diff --git a/update-goose-pkgbuild.sh b/update-goose-pkgbuild.sh index 5ad3408a86ee..6c585f1dfb17 100755 --- a/update-goose-pkgbuild.sh +++ b/update-goose-pkgbuild.sh @@ -1,47 +1,80 @@ #!/usr/bin/env bash set -euo pipefail +# Colors for output +RED='\033[0;31m' GREEN='\033[0;32m' YELLOW='\033[1;33m' -NC='\033[0m' +NC='\033[0m' # No Color REPO="block/goose" +PKGBUILD_FILE="PKGBUILD" -echo -e "${GREEN}Fetching latest release...${NC}" +echo -e "${GREEN}Fetching latest release from GitHub API...${NC}" + +# Fetch the latest release info from GitHub API RELEASE_DATA=$(curl -s "https://api.github.com/repos/${REPO}/releases/latest") + +# Extract version (remove 'v' prefix if present) LATEST_VERSION=$(echo "$RELEASE_DATA" | jq -r '.tag_name' | sed 's/^v//') if [[ -z "$LATEST_VERSION" || "$LATEST_VERSION" == "null" ]]; then - echo "Error: Could not fetch latest version" + echo -e "${RED}Error: Could not fetch latest version${NC}" exit 1 fi -echo -e "${GREEN}Latest: ${YELLOW}${LATEST_VERSION}${NC}" +echo -e "${GREEN}Latest version: ${YELLOW}${LATEST_VERSION}${NC}" -CURRENT_VERSION=$(grep '^pkgver=' PKGBUILD | cut -d'=' -f2) -echo -e "${GREEN}Current: ${YELLOW}${CURRENT_VERSION}${NC}" +# Get current version from PKGBUILD +CURRENT_VERSION=$(grep '^pkgver=' "$PKGBUILD_FILE" | cut -d'=' -f2) + +echo -e "${GREEN}Current version: ${YELLOW}${CURRENT_VERSION}${NC}" if [[ "$LATEST_VERSION" == "$CURRENT_VERSION" ]]; then - echo "Already up to date!" - exit 0 + echo -e "${YELLOW}Already up to date! Refreshing checksums...${NC}" +else + echo -e "${YELLOW}Updating ${CURRENT_VERSION} → ${LATEST_VERSION}${NC}" fi -sed -i "s/^pkgver=.*/pkgver=${LATEST_VERSION}/" PKGBUILD -sed -i "s/^pkgrel=.*/pkgrel=1/" PKGBUILD +# Update PKGBUILD version +echo -e "${GREEN}Updating PKGBUILD version...${NC}" +sed -i "s/^pkgver=.*/pkgver=${LATEST_VERSION}/" "$PKGBUILD_FILE" +sed -i "s/^pkgrel=.*/pkgrel=1/" "$PKGBUILD_FILE" -echo -e "${GREEN}Downloading tarball for b2sum...${NC}" +# Download tarball with progress and calculate checksum TARBALL_URL="https://github.com/${REPO}/archive/refs/tags/v${LATEST_VERSION}.tar.gz" -B2SUM=$(curl -L "$TARBALL_URL" | b2sum | awk '{print $1}') -# Replace first checksum only, preserve patch checksum -sed -i "0s/b2sums=('.*'/b2sums=('${B2SUM}'/" PKGBUILD +TARBALL_FILE="goose-desktop-${LATEST_VERSION}.tar.gz" -makepkg --printsrcinfo >| .SRCINFO +# Download only if missing +if [[ -f "$TARBALL_FILE" ]]; then + echo -e "${YELLOW}Using cached tarball${NC}" +else + echo -e "${GREEN}Downloading tarball...${NC}" + curl -L -o "$TARBALL_FILE" "$TARBALL_URL" +fi -echo -e "${GREEN}Verifying tarball download...${NC}" -makepkg -od +# Calculate b2sum +B2SUM=$(b2sum "$TARBALL_FILE" | awk '{print $1}') -echo -e "${GREEN}✓ Updated to ${LATEST_VERSION}${NC}" +# Update checksum in PKGBUILD +sed -i "s/^b2sums=.*/b2sums=('${B2SUM}')/" "$PKGBUILD_FILE" + +# Generate .SRCINFO +echo -e "${GREEN}Generating .SRCINFO...${NC}" +makepkg --printsrcinfo > .SRCINFO.tmp +mv .SRCINFO.tmp .SRCINFO + +echo -e "${GREEN}✓ PKGBUILD updated successfully!${NC}" +echo -e "${GREEN}✓ .SRCINFO generated successfully!${NC}" echo "" -echo "Next:" -echo " git diff PKGBUILD .SRCINFO" -echo " makepkg -si" +if [[ "$LATEST_VERSION" != "$CURRENT_VERSION" ]]; then + echo -e "${YELLOW}Changes:${NC}" + echo -e " Version: ${CURRENT_VERSION} → ${LATEST_VERSION}" + echo -e " b2sum: ${B2SUM}" +fi +echo "" +echo -e "${YELLOW}Next steps:${NC}" +echo " 1. Review changes: git diff PKGBUILD .SRCINFO" +echo " 2. Test build: makepkg -si" +echo " 3. Commit: git add PKGBUILD .SRCINFO && git commit -m 'upgpkg: ${LATEST_VERSION}'" +echo " 4. Push: git push"