From d944c7d5889582d5520f790b3253512f907463ea Mon Sep 17 00:00:00 2001 From: LukeeGD <26163116+LukeZGD@users.noreply.github.com> Date: Sun, 10 Nov 2024 20:34:07 +0800 Subject: [PATCH] untested void linux "support" (#610), add more checks for path commands --- README.md | 5 ++--- restore.sh | 8 +++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 14c5b8d..50025f9 100644 --- a/README.md +++ b/README.md @@ -120,13 +120,12 @@ #### Supported architectures: x86_64, arm64, armhf +- **macOS** 10.11 and newer (10.12 and newer recommended for full support) - [**Ubuntu**](https://ubuntu.com/) 22.04 and newer, and Ubuntu-based distros like [Linux Mint](https://www.linuxmint.com/) - [**Arch Linux**](https://www.archlinux.org/) and Arch-based distros like [EndeavourOS](https://endeavouros.com/) - [**Fedora**](https://getfedora.org/) 37 and newer, Fedora Atomic (Silverblue, Kinoite, etc.) also supported - [**Debian**](https://www.debian.org/) 12 Bookworm and newer, Sid, and Debian-based distros -- [**openSUSE**](https://www.opensuse.org/) Tumbleweed -- [**Gentoo**](https://www.gentoo.org/) and Gentoo-based distros -- **macOS** 10.11 and newer (10.12 and newer recommended) +- Less tested distros: [**openSUSE Tumbleweed**](https://get.opensuse.org/tumbleweed/), [**Gentoo**](https://www.gentoo.org/), [**Void Linux**](https://voidlinux.org/) ## Tools and other stuff used - curl diff --git a/restore.sh b/restore.sh index 4765b3e..9bf0b4a 100755 --- a/restore.sh +++ b/restore.sh @@ -181,6 +181,8 @@ set_tool_paths() { distro="opensuse" elif [[ $ID == "gentoo" || $ID_LIKE == "gentoo" || $ID == "pentoo" ]]; then distro="gentoo" + elif [[ $ID == "void" ]]; then + distro="void" else error "Your distro ($platform_ver - $platform_arch) is not detected/supported. See the repo README for supported OS versions/distros" fi @@ -407,6 +409,9 @@ install_depends() { elif [[ $distro == "gentoo" ]]; then sudo emerge -av --noreplace app-arch/zstd app-misc/ca-certificates app-pda/ifuse dev-libs/libxml2 libimobiledevice net-misc/curl openssh python udev unzip usbmuxd usbutils vim zenity zip + elif [[ $distro == "void" ]]; then + sudo xbps-install curl git patch openssh python3 unzip xxd zenity zip base-devel libffi-devel bzip2-devel openssl openssl-devel readline readline-devel sqlite-devel xz liblzma-devel zlib zlib-devel + elif [[ $platform == "macos" ]]; then print "* Legacy iOS Kit will be installing dependencies and setting up permissions of tools" xattr -cr ../bin/macos @@ -8923,7 +8928,8 @@ main() { version_check - if [[ ! -e "../resources/firstrun" || $(cat "../resources/firstrun") != "$platform_ver" || + if [[ ! -e "../resources/firstrun" || $(cat "../resources/firstrun") != "$platform_ver" || ! $(command -v unzip) || + ! $(command -v zip) || ! $(command -v scp) || ! $(command -v ssh) || ! $(command -v patch) || -z $zenity || ! $(command -v curl) || ! $(command -v xxd) || ! $(command -v git) ]]; then install_depends fi