Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(whalebird): s/x64/amd64/ #1174

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Conversation

rasa
Copy link
Contributor

@rasa rasa commented Sep 29, 2024

No description provided.

@flexiondotorg flexiondotorg merged commit 7a350cc into wimpysworld:main Sep 30, 2024
1 check passed
@rasa
Copy link
Contributor Author

rasa commented Sep 30, 2024

@philclifford @flexiondotorg Thanks for merging, but it looks like some of the changes in
9b99345
were lost. Specifically:

diff --git a/01-main/packages/whalebird b/01-main/packages/whalebird
index 068787f2..c986b676 100644
--- a/01-main/packages/whalebird
+++ b/01-main/packages/whalebird
@@ -1,8 +1,8 @@
 DEFVER=1
 get_github_releases "h3poteto/whalebird-desktop"
 if [ "${ACTION}" != "prettylist" ]; then
-    URL="$(grep "browser_download_url.*x64\.deb\"" "${CACHE_FILE}" | grep -v beta | head -n1 | cut -d'"' -f4)"
-    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'/' -f8)"
+    URL="$(grep "browser_download_url.*64\.deb\"" "${CACHE_FILE}" | grep -v -e beta -e alpha -e '-rc\.' | head -n1 | cut -d'"' -f4)"
+    VERSION_PUBLISHED="$(echo "${URL}" | cut -d'/' -f8 | tr -d v)"
 fi
 PRETTY_NAME="Whalebird"
 WEBSITE="https://whalebird.social/"

@philclifford
Copy link
Member

Indeed and it is thus re-broken. I like your 'grep -E' but with '(alpha|beta|-rc).'. For now I'll revert this.

philclifford added a commit that referenced this pull request Oct 2, 2024
philclifford added a commit to philclifford/deb-get that referenced this pull request Oct 2, 2024
Replace fix for upstream release rename that will still work if they change back and
correct derivation of versioning that were lost in merge of wimpysworld#1174.

Also retains and extends grep improvements from wimpysworld#1174 and removes a surplus head
Supcercedes and closes
Closes wimpysworld#1177

Co-authored-by: Ross Smith II  <[email protected]>
philclifford added a commit to philclifford/deb-get that referenced this pull request Oct 2, 2024
Replace fix for upstream release rename that will still work if they change back and
correct derivation of versioning that were lost in merge of wimpysworld#1174.

Also retains and extends grep improvements from wimpysworld#1174 and removes a surplus head
Supcercedes and closes
Closes wimpysworld#1177

Co-authored-by: Ross Smith II  <[email protected]>
flexiondotorg pushed a commit that referenced this pull request Oct 4, 2024
Replace fix for upstream release rename that will still work if they change back and
correct derivation of versioning that were lost in merge of #1174.

Also retains and extends grep improvements from #1174 and removes a surplus head
Supcercedes and closes
Closes #1177

Co-authored-by: Ross Smith II  <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants