From 47fe721db1c0361aa7536fd15ad072801b191b90 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Tue, 18 Jun 2024 09:10:26 -0400 Subject: [PATCH] MuseScore: switch to separate armhf and arm64 versions --- .github/workflows/updates/MuseScore.sh | 7 ++++--- apps/MuseScore/install | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/updates/MuseScore.sh b/.github/workflows/updates/MuseScore.sh index 7a0d5a743f..c079c102d8 100755 --- a/.github/workflows/updates/MuseScore.sh +++ b/.github/workflows/updates/MuseScore.sh @@ -1,7 +1,8 @@ #!/bin/bash -webVer=$(curl -s --header "Authorization: token $GH_PERSONAL_ACCESS_TOKEN" "https://api.github.com/repos/musescore/MuseScore/releases/latest" | jq -r '.assets | .[].browser_download_url' | grep aarch64.AppImage$ | sed 's;https://github.com/musescore/MuseScore/releases/download/v'.*'/MuseScore-Studio-;;g' | sed 's;-aarch64.AppImage;;g') -armhf_url="https://github.com/musescore/MuseScore/releases/download/v${webVer%.*}/MuseScore-Studio-${webVer}-armv7l.AppImage" -arm64_url="https://github.com/musescore/MuseScore/releases/download/v${webVer%.*}/MuseScore-Studio-${webVer}-aarch64.AppImage" +version_armhf=$(curl -s --header "Authorization: token $GH_PERSONAL_ACCESS_TOKEN" "https://api.github.com/repos/musescore/MuseScore/releases/latest" | jq -r '.assets | .[].browser_download_url' | grep armv7l.AppImage$ | sed 's;https://github.com/musescore/MuseScore/releases/download/v'.*'/MuseScore-Studio-;;g' | sed 's;-armv7l.AppImage;;g') +version_arm64=$(curl -s --header "Authorization: token $GH_PERSONAL_ACCESS_TOKEN" "https://api.github.com/repos/musescore/MuseScore/releases/latest" | jq -r '.assets | .[].browser_download_url' | grep aarch64.AppImage$ | sed 's;https://github.com/musescore/MuseScore/releases/download/v'.*'/MuseScore-Studio-;;g' | sed 's;-aarch64.AppImage;;g') +armhf_url="https://github.com/musescore/MuseScore/releases/download/v${version_armhf%.*}/MuseScore-Studio-${version_armhf}-armv7l.AppImage" +arm64_url="https://github.com/musescore/MuseScore/releases/download/v${version_arm64%.*}/MuseScore-Studio-${version_arm64}-aarch64.AppImage" source $GITHUB_WORKSPACE/.github/workflows/update_github_script.sh diff --git a/apps/MuseScore/install b/apps/MuseScore/install index 5934dd337f..35b8817c9f 100755 --- a/apps/MuseScore/install +++ b/apps/MuseScore/install @@ -1,10 +1,13 @@ #!/bin/bash -version=4.3.1.241490902 +version_armhf=4.3.1.241490902 +version_arm64=4.3.1.241490902 if [ $arch == 32 ];then + version_select="$version_armhf" url_arch=armv7l elif [ $arch == 64 ];then + version_select="$version_arm64" url_arch=aarch64 else error "Failed to detect OS CPU architecture! Something is very wrong." @@ -17,7 +20,7 @@ fi enable_module fuse || exit 1 -wget -O "/tmp/MuseScore.AppImage" "https://github.com/musescore/MuseScore/releases/download/v${version%.*}/MuseScore-Studio-${version}-${url_arch}.AppImage" || exit 1 +wget -O "/tmp/MuseScore.AppImage" "https://github.com/musescore/MuseScore/releases/download/v${version_select%.*}/MuseScore-Studio-${version_select}-${url_arch}.AppImage" || exit 1 chmod +x "/tmp/MuseScore.AppImage"