From 3332db14edcbd1e5e91c6231bfb7876417a9f0d4 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Fri, 20 Jan 2023 19:11:36 -0500 Subject: [PATCH] XSnow: switch to buildscript progress for: https://github.com/Botspot/pi-apps/issues/2160 progress for: https://github.com/Botspot/pi-apps/issues/2232 --- .github/workflows/updates/XSnow.sh | 5 ++--- apps/XSnow/install | 13 +++++++++++++ apps/XSnow/install-32 | 5 ----- apps/XSnow/install-64 | 5 ----- apps/XSnow/uninstall | 2 ++ etc/category-overrides-jetson-18.04 | 1 - 6 files changed, 17 insertions(+), 14 deletions(-) create mode 100755 apps/XSnow/install delete mode 100755 apps/XSnow/install-32 delete mode 100755 apps/XSnow/install-64 diff --git a/.github/workflows/updates/XSnow.sh b/.github/workflows/updates/XSnow.sh index 2cb6c202ff..a28ee50c8d 100755 --- a/.github/workflows/updates/XSnow.sh +++ b/.github/workflows/updates/XSnow.sh @@ -1,7 +1,6 @@ #!/bin/bash -webVer=$(wget -qO- https://www.ratrabbit.nl/ratrabbit/xsnow/downloads/index.html | grep -A1 "Download debian package for Raspbian:" | tail -n 1 | sed 's/

//g ; s+

++g' | sed 's+"./../../../downloads/xsnow/.*armhf.deb">++g ; s+++g' | grep -oP '^[^\_]*\_\K[^\_]+') -armhf_url="https://www.ratrabbit.nl/downloads/xsnow/xsnow_${webVer}_armhf.deb" -arm64_url="https://www.ratrabbit.nl/downloads/xsnow/xsnow_${webVer}_arm64.deb" +webVer=$(wget -qO- https://www.ratrabbit.nl/ratrabbit/xsnow/downloads/index.html | grep -A1 "Download source:" | tail -n 1 | sed 's/

//g ; s+

++g' | sed 's+"./../../../downloads/xsnow/xsnow-.*tar.gz">++g ; s+++g' | grep -oP '^[^-]*\-\K[^*]+' | sed -n 's/.tar.gz//p') +all_url="https://www.ratrabbit.nl/downloads/xsnow/xsnow-${webVer}.tar.gz" source $GITHUB_WORKSPACE/.github/workflows/update_github_script.sh diff --git a/apps/XSnow/install b/apps/XSnow/install new file mode 100755 index 0000000000..4da1360f76 --- /dev/null +++ b/apps/XSnow/install @@ -0,0 +1,13 @@ +#!/bin/bash + +version=3.7.0~pre02 + +install_packages build-essential libx11-dev libxpm-dev libxt-dev libxext-dev pkg-config libxml2-dev libgtk-3-dev libxinerama-dev libxtst-dev libgsl-dev || exit 1 + +cd /tmp || error "Could not move to /tmp folder" +rm -rf /tmp/xsnow* +wget -O xsnow.tar.gz https://www.ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz +tar -xvf xsnow.tar.gz +cd xsnow-${version} || error "Could not move to xsnow directory folder" +./configure --prefix=/usr && make -j$(nproc) && sudo make install || error "Make install failed" +rm -rf /tmp/xsnow* diff --git a/apps/XSnow/install-32 b/apps/XSnow/install-32 deleted file mode 100755 index 0c291c3562..0000000000 --- a/apps/XSnow/install-32 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -version=3.6.0-1 - -install_packages https://www.ratrabbit.nl/downloads/xsnow/xsnow_${version}_armhf.deb || exit 1 diff --git a/apps/XSnow/install-64 b/apps/XSnow/install-64 deleted file mode 100755 index 2dde87ecf4..0000000000 --- a/apps/XSnow/install-64 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -version=3.6.0-1 - -install_packages https://www.ratrabbit.nl/downloads/xsnow/xsnow_${version}_arm64.deb || exit 1 diff --git a/apps/XSnow/uninstall b/apps/XSnow/uninstall index faef2d9613..2593a32330 100755 --- a/apps/XSnow/uninstall +++ b/apps/XSnow/uninstall @@ -1,3 +1,5 @@ #!/bin/bash +sudo rm -rf /usr/games/xsnow /usr/share/applications/xsnow.desktop /usr/share/doc/xsnow /usr/share/locale/*/LC_MESSAGES/xsnow.mo /usr/share/man/man6/xsnow.6.gz /usr/share/metainfo/xsnow.appdata.xml /usr/share/pixmaps/xsnow.svg + purge_packages || exit 1 diff --git a/etc/category-overrides-jetson-18.04 b/etc/category-overrides-jetson-18.04 index 2a347e2ca3..35ee1c642d 100644 --- a/etc/category-overrides-jetson-18.04 +++ b/etc/category-overrides-jetson-18.04 @@ -44,6 +44,5 @@ Vivaldi|hidden Windows 10 Theme|hidden Windows Flasher|hidden Windows Screensavers|hidden -XSnow|hidden YouTubuddy|hidden Zoom|hidden