From b6741be890f7da0e7af97ea2b7bd6328fc5e80b1 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Wed, 8 May 2024 13:35:33 -0400 Subject: [PATCH] Minecraft Bedrock: fix t64 packages --- apps/Minecraft Bedrock/install-32 | 12 +++++++++--- apps/Minecraft Bedrock/install-64 | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/apps/Minecraft Bedrock/install-32 b/apps/Minecraft Bedrock/install-32 index 0bc1bba1e4..a15823c893 100755 --- a/apps/Minecraft Bedrock/install-32 +++ b/apps/Minecraft Bedrock/install-32 @@ -1,14 +1,20 @@ #!/bin/bash # Get dependencies -install_packages libx11-6 libxext6 libegl1 zlib1g libstdc++6 libgl1-mesa-dri libasound2 libcom-err2 libgmp10 libp11-kit0 || exit 1 +bedrock_depends=() +if package_available libasound2t64; then + bedrock_depends+=('libasound2t64') +else + bedrock_depends+=('libasound2') +fi +install_packages ${bedrock_depends[@]} libx11-6 libxext6 libegl1 zlib1g libstdc++6 libgl1-mesa-dri libcom-err2 libgmp10 libp11-kit0 || exit 1 #Download file mkdir -p ~/.local/bin || error "Could not make directory" if package_is_new_enough libc6 2.36 ;then - wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.12.1-763/Minecraft_Bedrock_Launcher-bookworm-armhf-v0.12.1.763.AppImage' || error "failed to download Minecraft Bedrock Launcher" + wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.14.2-792/Minecraft_Bedrock_Launcher-bookworm-armhf-v0.14.2.792.AppImage' || error "failed to download Minecraft Bedrock Launcher" else - wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.12.1-763/Minecraft_Bedrock_Launcher-armhf-v0.12.1.763.AppImage' || error "failed to download Minecraft Bedrock Launcher" + wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.14.2-792/Minecraft_Bedrock_Launcher-armhf-v0.14.2.792.AppImage' || error "failed to download Minecraft Bedrock Launcher" fi chmod +x ~/.local/bin/MCBedrock.AppImage diff --git a/apps/Minecraft Bedrock/install-64 b/apps/Minecraft Bedrock/install-64 index 727a0ee49d..b37adc5e67 100755 --- a/apps/Minecraft Bedrock/install-64 +++ b/apps/Minecraft Bedrock/install-64 @@ -5,7 +5,13 @@ get_model &>/dev/null if [[ -z "$jetson_model" ]] && [ ! -z "$__cpu_op_mode_32" ]; then sudo dpkg --add-architecture armhf - install_packages libx11-6:armhf libxext6:armhf libegl1:armhf zlib1g:armhf libstdc++6:armhf libgl1-mesa-dri:armhf libasound2:armhf libpulse0:armhf libcom-err2:armhf libgmp10:armhf libp11-kit0:armhf libsystemd0:armhf || exit 1 + bedrock_depends=() + if package_available libasound2t64:armhf; then + bedrock_depends+=('libasound2t64:armhf') + else + bedrock_depends+=('libasound2:armhf') + fi + install_packages ${bedrock_depends[@]} libx11-6:armhf libxext6:armhf libegl1:armhf zlib1g:armhf libstdc++6:armhf libgl1-mesa-dri:armhf libpulse0:armhf libcom-err2:armhf libgmp10:armhf libp11-kit0:armhf libsystemd0:armhf || exit 1 else warning "Your system is only capable of running the ARM64 versions of Minecraft Bedrock. You will be unable to run older ARM32 versions of Minecraft Bedrock that you may find in this launcher." fi @@ -13,9 +19,9 @@ fi #Download file mkdir -p ~/.local/bin || error "Could not make directory" if package_is_new_enough libc6 2.36 ;then - wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.12.1-763/Minecraft_Bedrock_Launcher-bookworm-arm64-v0.12.1.763.AppImage' || error "failed to download Minecraft Bedrock Launcher" + wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.14.2-792/Minecraft_Bedrock_Launcher-bookworm-arm64-v0.14.2.792.AppImage' || error "failed to download Minecraft Bedrock Launcher" else - wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.12.1-763/Minecraft_Bedrock_Launcher-arm64-v0.12.1.763.AppImage' || error "failed to download Minecraft Bedrock Launcher" + wget -O ~/.local/bin/MCBedrock.AppImage 'https://github.com/minecraft-linux/appimage-builder/releases/download/v0.14.2-792/Minecraft_Bedrock_Launcher-arm64-v0.14.2.792.AppImage' || error "failed to download Minecraft Bedrock Launcher" fi chmod +x ~/.local/bin/MCBedrock.AppImage