From 1dcd2bce6c4cae3b189cf49857f867f8ed01d37e Mon Sep 17 00:00:00 2001 From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com> Date: Sun, 25 Apr 2021 17:27:24 +0300 Subject: [PATCH 1/5] Fix syntax error in box86 install-64 --- apps/Box86/install-64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Box86/install-64 b/apps/Box86/install-64 index 0680adc..48ce642 100755 --- a/apps/Box86/install-64 +++ b/apps/Box86/install-64 @@ -28,7 +28,7 @@ fi CODENAME="$(lsb_release -cs)" if [[ "${CODENAME}" == "focal" || "${CODENAME}" == "buster" ]]; 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:armhf 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" || "${CODENAME} == "hirsute" ]]; then +elif [[ "${CODENAME}" == "groovy" || "${CODENAME}" == "hirsute" ]]; 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:armhf 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 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" From e51721fce654e61794d3cf1b3ec2b9ee64306389 Mon Sep 17 00:00:00 2001 From: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com> Date: Mon, 26 Apr 2021 13:59:50 +0100 Subject: [PATCH 2/5] Update app-request.md --- .github/ISSUE_TEMPLATE/app-request.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/app-request.md b/.github/ISSUE_TEMPLATE/app-request.md index 53c6c4d..6c029f0 100644 --- a/.github/ISSUE_TEMPLATE/app-request.md +++ b/.github/ISSUE_TEMPLATE/app-request.md @@ -8,7 +8,13 @@ assignees: '' --- Can this app run on RPi? If so, please provide a link to a tutorial if applicable. + + Is this app something many GUI users would find useful? + + Is this app installable with `sudo apt install`? + If you've created a zip file for this app, upload it here. + From 98539f14e1e831e1209e0d9ec4f3d67e52b4e248 Mon Sep 17 00:00:00 2001 From: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com> Date: Mon, 26 Apr 2021 14:02:25 +0100 Subject: [PATCH 3/5] Update app-request.md --- .github/ISSUE_TEMPLATE/app-request.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/app-request.md b/.github/ISSUE_TEMPLATE/app-request.md index 6c029f0..61e595c 100644 --- a/.github/ISSUE_TEMPLATE/app-request.md +++ b/.github/ISSUE_TEMPLATE/app-request.md @@ -7,14 +7,10 @@ assignees: '' --- -Can this app run on RPi? If so, please provide a link to a tutorial if applicable. +Can this app run on RPi? If so, please provide a link to a tutorial if applicable. +Is this app something many GUI users would find useful? -Is this app something many GUI users would find useful? - - -Is this app installable with `sudo apt install`? - +Is this app installable with `sudo apt install`? If you've created a zip file for this app, upload it here. - From 39bb3378048ae8965a4bd4740f593f172e3115b7 Mon Sep 17 00:00:00 2001 From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com> Date: Mon, 26 Apr 2021 17:16:26 +0300 Subject: [PATCH 4/5] Update prebuilt 3g/1g kernel for rpi3 (Wine) --- apps/Wine (x86)/install-32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Wine (x86)/install-32 b/apps/Wine (x86)/install-32 index a6f30e4..dbe09c5 100755 --- a/apps/Wine (x86)/install-32 +++ b/apps/Wine (x86)/install-32 @@ -102,7 +102,7 @@ elif echo "$vmsplit_output" | grep -q "^CONFIG_VMSPLIT_2G=y" || echo "$vmsplit_o [ -e ~/linux ] && (echo "$HOME/linux already exists, moving it to $HOME/linux.bak" ; mv -f ~/linux ~/linux.bak) #download precompiled kernel echo "Downloading precompiled kernel..." - wget https://github.com/Itai-Nelken/RPi-3g-1g-kernel-wine/releases/download/3/rpi23_3g1g_kernel.tar.xz -O ~/3g1g-rpi-kernel.tar.xz || error "Failed to download prebuilt kernel!" + wget https://github.com/Itai-Nelken/RPi-3g-1g-kernel-wine/releases/download/4/rpi23_3g1g_kernel.tar.xz -O ~/3g1g-rpi-kernel.tar.xz || error "Failed to download prebuilt kernel!" #extract precompiled kernel echo "Extracting prebuilt kernel..." tar -xf ~/3g1g-rpi-kernel.tar.xz || error "Failed to extract kernel!" From 93769bedcf77214a1d9477cb6b891ff49fecaacc Mon Sep 17 00:00:00 2001 From: Itai Nelken <70802936+Itai-Nelken@users.noreply.github.com> Date: Mon, 26 Apr 2021 20:20:46 +0300 Subject: [PATCH 5/5] Fix Box86 uninstall script not having the DIRECTORY variable --- apps/Box86/uninstall | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/Box86/uninstall b/apps/Box86/uninstall index 2b3d10d..428a558 100755 --- a/apps/Box86/uninstall +++ b/apps/Box86/uninstall @@ -1,5 +1,7 @@ #!/bin/bash +DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")" + function error { echo -e "\\e[91m$1\\e[39m" exit 1 @@ -26,11 +28,10 @@ if [ ! -z "$(file "$(readlink -f "/sbin/init")" | grep 64)" ]; then "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1 - sudo dpkg --remove-architecture armhf || warning "Failed to remove armhf architecture.\nMost likely, you already had other armhf packages installed prior to this." + sudo dpkg --remove-architecture armhf || warning "armhf architecture should be removed by now, but it isn't!" check-armhf if [[ "$ARMHF" == *"armhf"* ]]; then - warning "armhf architecture should be removed by now, but it isn't!" - warning "You probably have some other programs using it, remove it by running 'sudo dpkg --remove-architecture armhf'." + warning "You probably have some other programs using it, remove it by running 'sudo dpkg --remove-architecture armhf'." fi elif [ ! -z "$(file "$(readlink -f "/sbin/init")" | grep 32)" ]; then @@ -41,4 +42,4 @@ else fi echo "running 'sudo apt update'..." -sudo apt update \ No newline at end of file +sudo apt update