From 4e8c037811de3192850495470f58c207c8ec3ce0 Mon Sep 17 00:00:00 2001 From: RPI News <44128563+mobilegmYT@users.noreply.github.com> Date: Fri, 23 Jul 2021 13:33:55 -0600 Subject: [PATCH 1/5] Wait for apt locks to be removed on uninstall too --- apps/Minecraft Pi (Modded)/uninstall | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/apps/Minecraft Pi (Modded)/uninstall b/apps/Minecraft Pi (Modded)/uninstall index fca5a4b..e4b1e41 100755 --- a/apps/Minecraft Pi (Modded)/uninstall +++ b/apps/Minecraft Pi (Modded)/uninstall @@ -7,6 +7,22 @@ function error { exit 1 } +# Wait for apt lock to be released +i=0 +while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock > /dev/null 2>&1 +do + case $(($i % 4)) in + 0) j="-";; + 1) j="\\";; + 2) j="|";; + 3) j="/";; + esac + printf "\r[$j] Waiting for other package managers to finish..." + sleep 0.5 + ((i+=1)) +done +[[ $i -gt 0 ]] && printf "Done.\n" + sudo apt-get remove -y minecraft-pi-reborn-native &>/dev/null || true "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1 From d0907d2ce7800533eded6b663041f7c6f560079f Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Sat, 24 Jul 2021 16:30:03 +0530 Subject: [PATCH 2/5] Remove debian buster remove mentions to buster as it fails to install on it --- apps/Box86/install-64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/Box86/install-64 b/apps/Box86/install-64 index e80daba..a9151cc 100755 --- a/apps/Box86/install-64 +++ b/apps/Box86/install-64 @@ -26,14 +26,14 @@ fi #install box86 dependencies CODENAME="$(lsb_release -cs)" -if [[ "${CODENAME}" == "focal" || "${CODENAME}" == "buster" ]]; then +if [[ "${CODENAME}" == "focal" ]]; then "${DIRECTORY}/pkg-install" "libraspberrypi0:armhf libssh-gcrypt-4:armhf libgssapi-krb5-2:armhf libkrb5-3:armhf libssl1.1:armhf libcups2:armhf libsdl1.2debian:armhf libopusfile0:armhf libc6:armhf libx11-6:armhf libgdk-pixbuf2.0-0:armhf libgtk2.0-0:armhf libstdc++6:armhf libsdl2-2.0-0:armhf mesa-va-drivers:armhf libsdl1.2-dev:armhf libsdl-mixer1.2:armhf libpng16-16:armhf libcal3d12v5:armhf libsdl2-net-2.0-0:armhf libopenal1:armhf libsdl2-image-2.0-0:armhf libvorbis-dev:armhf libcurl4:armhf osspd:armhf pulseaudio libjpeg62:armhf libudev1:armhf libgl1-mesa-dev:armhf libsnappy1v5:armhf libx11-dev:armhf libsmpeg0:armhf libboost-filesystem1.67.0:armhf libboost-program-options1.67.0:armhf libavcodec58:armhf libavformat58:armhf libswscale5:armhf libmyguiengine3debian1v5:armhf libboost-iostreams1.67.0:armhf libsdl2-mixer-2.0-0:armhf" "$(dirname "$0")" || exit 1 elif [[ "${CODENAME}" == "groovy" ]]; then "${DIRECTORY}/pkg-install" "libraspberrypi0:armhf libssh-gcrypt-4:armhf libgssapi-krb5-2:armhf libkrb5-3:armhf libssl1.1:armhf libcups2:armhf libsdl1.2debian:armhf libopusfile0:armhf libc6:armhf libx11-6:armhf libgdk-pixbuf2.0-0:armhf libgtk2.0-0:armhf libstdc++6:armhf libsdl2-2.0-0:armhf mesa-va-drivers:armhf libsdl1.2-dev:armhf libsdl-mixer1.2:armhf libpng16-16:armhf libcal3d12v5:armhf libsdl2-net-2.0-0:armhf libopenal1:armhf libsdl2-image-2.0-0:armhf libvorbis-dev:armhf libcurl4:armhf osspd:armhf pulseaudio libjpeg62:armhf libudev1:armhf libgl1-mesa-dev:armhf libsnappy1v5:armhf libx11-dev:armhf libsmpeg0:armhf libboost-filesystem1.71.0:armhf libboost-program-options1.71.0:armhf libavcodec58:armhf libavformat58:armhf libswscale5:armhf libmyguiengine3debian1v5:armhf libboost-iostreams1.71.0:armhf libsdl2-mixer-2.0-0:armhf" "$(dirname "$0")" || exit 1 elif [[ "${CODENAME}" == "hirsute" ]]; then "${DIRECTORY}/pkg-install" "libssh-gcrypt-4:armhf libgssapi-krb5-2:armhf libkrb5-3:armhf libssl1.1:armhf libcups2:armhf libsdl1.2debian:armhf libopusfile0:armhf libc6:armhf libx11-6:armhf libgdk-pixbuf2.0-0:armhf libgtk2.0-0:armhf libstdc++6:armhf libsdl2-2.0-0:armhf mesa-va-drivers:armhf libsdl1.2-dev:armhf libsdl-mixer1.2:armhf libpng16-16:armhf libcal3d12v5:armhf libsdl2-net-2.0-0:armhf libopenal1:armhf libsdl2-image-2.0-0:armhf libvorbis-dev:armhf libcurl4:armhf osspd:armhf pulseaudio libjpeg62:armhf libudev1:armhf libgl1-mesa-dev:armhf libsnappy1v5:armhf libx11-dev:armhf libsmpeg0:armhf libboost-filesystem1.74.0:armhf libboost-program-options1.74.0:armhf libavcodec58:armhf libavformat58:armhf libswscale5:armhf libmyguiengine3debian1v5:armhf libboost-iostreams1.74.0:armhf libsdl2-mixer-2.0-0:armhf" "$(dirname "$0")" || exit 1 else - error "this script can't run on your OS! it HAS to be Debian buster or Ubuntu 20.04, 20.10 or 21.04" + error "this script can't run on your OS! It HAS to be Ubuntu 20.04, 20.10 or 21.04" fi sudo rm /etc/apt/sources.list.d/box86.list &>/dev/null From f6348b99fa09bde98c45af26999d7e22a6ed064f Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Sat, 24 Jul 2021 16:48:22 +0530 Subject: [PATCH 3/5] Remove support for buster as box86 does not support it --- apps/Zoom/install-64 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/Zoom/install-64 b/apps/Zoom/install-64 index fcaf540..905e416 100755 --- a/apps/Zoom/install-64 +++ b/apps/Zoom/install-64 @@ -11,16 +11,16 @@ cd $HOME # Get dependencies CODENAME=$(lsb_release -cs) -if [[ "${CODENAME}" == "buster" ]]; then - "${DIRECTORY}/pkg-install" "pulseaudio-utils pulseaudio gnome-themes-extra:armhf gtk2-engines-pixbuf:armhf libxcb-shape0:armhf libxcb-randr0:armhf libxcb-image0:armhf libxcb-xtest0:armhf libxcb-keysyms1:armhf libxcb-xfixes0:armhf libturbojpeg0:armhf libdbus-1-3:armhf libx11-6:armhf libxtst6:armhf libsm6:armhf libicu63:armhf libjsoncpp1:armhf librhash0:armhf libsqlite3-0:armhf libssh-4:armhf libuv1:armhf libwind0-heimdal:armhf libxml2:armhf" "$(dirname "$0")" || exit 1 -elif [[ "${CODENAME}" == "focal" ]]; then +# if [[ "${CODENAME}" == "buster" ]]; then +# "${DIRECTORY}/pkg-install" "pulseaudio-utils pulseaudio gnome-themes-extra:armhf gtk2-engines-pixbuf:armhf libxcb-shape0:armhf libxcb-randr0:armhf libxcb-image0:armhf libxcb-xtest0:armhf libxcb-keysyms1:armhf libxcb-xfixes0:armhf libturbojpeg0:armhf libdbus-1-3:armhf libx11-6:armhf libxtst6:armhf libsm6:armhf libicu63:armhf libjsoncpp1:armhf librhash0:armhf libsqlite3-0:armhf libssh-4:armhf libuv1:armhf libwind0-heimdal:armhf libxml2:armhf" "$(dirname "$0")" || exit 1 +if [[ "${CODENAME}" == "focal" ]]; then "${DIRECTORY}/pkg-install" "pulseaudio-utils pulseaudio gnome-themes-extra:armhf gtk2-engines-pixbuf:armhf libxcb-shape0:armhf libxcb-randr0:armhf libxcb-image0:armhf libxcb-xtest0:armhf libxcb-keysyms1:armhf libxcb-xfixes0:armhf libturbojpeg:armhf libdbus-1-3:armhf libx11-6:armhf libxtst6:armhf libsm6:armhf libicu66:armhf libjsoncpp1:armhf librhash0:armhf libsqlite3-0:armhf libssh-4:armhf libuv1:armhf libwind0-heimdal:armhf libxml2:armhf" "$(dirname "$0")" || exit 1 elif [[ "${CODENAME}" == "groovy" ]]; then "${DIRECTORY}/pkg-install" "pulseaudio-utils pulseaudio gnome-themes-extra:armhf gtk2-engines-pixbuf:armhf libxcb-shape0:armhf libxcb-randr0:armhf libxcb-image0:armhf libxcb-xtest0:armhf libxcb-keysyms1:armhf libxcb-xfixes0:armhf libturbojpeg:armhf libdbus-1-3:armhf libx11-6:armhf libxtst6:armhf libsm6:armhf libicu67:armhf libjsoncpp1:armhf librhash0:armhf libsqlite3-0:armhf libssh-4:armhf libuv1:armhf libwind0-heimdal:armhf libxml2:armhf" "$(dirname "$0")" || exit 1 elif [[ "${CODENAME}" == "hirsute" ]]; then "${DIRECTORY}/pkg-install" "pulseaudio-utils pulseaudio gnome-themes-extra:armhf gtk2-engines-pixbuf:armhf libxcb-shape0:armhf libxcb-randr0:armhf libxcb-image0:armhf libxcb-xtest0:armhf libxcb-keysyms1:armhf libxcb-xfixes0:armhf libturbojpeg:armhf libdbus-1-3:armhf libx11-6:armhf libxtst6:armhf libsm6:armhf libicu67:armhf libjsoncpp24:armhf librhash0:armhf libsqlite3-0:armhf libssh-4:armhf libuv1:armhf libwind0-heimdal:armhf libxml2:armhf" "$(dirname "$0")" || exit 1 else - error "this script can't run on your OS! it HAS to be Debian buster or Ubuntu 20.04, 20.10 or 21.04" + error "this script can't run on your OS! it HAS to be Ubuntu 20.04, 20.10 or 21.04" fi #refresh list of libraries From 2cbd71bdd4342965e4041dcbd4644b3bab2e0b9a Mon Sep 17 00:00:00 2001 From: conrackx <79485248+conrackx@users.noreply.github.com> Date: Sat, 24 Jul 2021 11:26:11 -0400 Subject: [PATCH 4/5] Update install-64 to 4.0.2 --- apps/Vivaldi/install-64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Vivaldi/install-64 b/apps/Vivaldi/install-64 index cbdef39..a9d510d 100755 --- a/apps/Vivaldi/install-64 +++ b/apps/Vivaldi/install-64 @@ -8,6 +8,6 @@ function error { } rm -f ~/vivaldi.deb -wget https://downloads.vivaldi.com/stable/vivaldi-stable_3.8.2259.42-1_arm64.deb -O ~/vivaldi.deb || error 'Failed to download vivaldi!' +wget https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_arm64.deb -O ~/vivaldi.deb || error 'Failed to download vivaldi!' sudo apt install --fix-missing -y ~/vivaldi.deb || error 'Failed to install vivaldi!' rm -f ~/vivaldi.deb From f404164de0bbd8115bc23674ce82f9c4266bfb6e Mon Sep 17 00:00:00 2001 From: conrackx <79485248+conrackx@users.noreply.github.com> Date: Sat, 24 Jul 2021 11:35:40 -0400 Subject: [PATCH 5/5] Update install-32 to 4.0.2 --- apps/Vivaldi/install-32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Vivaldi/install-32 b/apps/Vivaldi/install-32 index 2915700..bd23a3e 100755 --- a/apps/Vivaldi/install-32 +++ b/apps/Vivaldi/install-32 @@ -8,6 +8,6 @@ function error { } rm -f ~/vivaldi.deb -wget https://downloads.vivaldi.com/stable/vivaldi-stable_3.8.2259.42-1_armhf.deb -O ~/vivaldi.deb || error 'Failed to download vivaldi!' +wget https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.41-1_armhf.deb -O ~/vivaldi.deb || error 'Failed to download vivaldi!' sudo apt install --fix-missing -y ~/vivaldi.deb || error 'Failed to install vivaldi!' rm -f ~/vivaldi.deb