From 9a9c9f9398b6ea4ba6d2d15a2a6d8a1dfd1ca431 Mon Sep 17 00:00:00 2001 From: Zeglius <33781398+Zeglius@users.noreply.github.com> Date: Sat, 22 Mar 2025 18:52:45 +0100 Subject: [PATCH] fix(install.sh): Use rpm-ostree package manager if available (#1399) * shadps4 location * fix bigpemu * fix paths * fix(install.sh): Use rpm-ostree package manager if available * perf(install.sh): Dont install system dependencies in Bazzite These already come baked in * Revert "perf(install.sh): Dont install system dependencies in Bazzite" This reverts commit 5ef6dadbfd90b0e2e8fdc7079a51469909284ce1. --------- Co-authored-by: Dragoon Dorise --- install-early.sh | 21 ++++++++++----------- install-unstable.sh | 21 ++++++++++----------- install.sh | 21 ++++++++++----------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/install-early.sh b/install-early.sh index faaf6dbe..8a4c3989 100644 --- a/install-early.sh +++ b/install-early.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash +DEBIAN_DEPS=(jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) +ARCH_DEPS=(steam jq zenity flatpak unzip bash fuse2 git rsync whiptail python) +FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) +SUSE_DEPS=(steam jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) +VOID_DEPS=(steam jq zenity flatpak unzip bash fuse git rsync whiptail python) + linuxID=$(lsb_release -si) sandbox="" @@ -52,38 +58,31 @@ else if command -v apt-get >/dev/null; then echo "Installing packages with apt..." - DEBIAN_DEPS=(jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) sudo killall apt apt-get sudo apt-get -y update sudo apt-get -y install "${DEBIAN_DEPS[@]}" elif command -v pacman >/dev/null; then echo "Installing packages with pacman..." - ARCH_DEPS=(steam jq zenity flatpak unzip bash fuse2 git rsync whiptail python) sudo pacman --noconfirm -Syu sudo pacman --noconfirm -S "${ARCH_DEPS[@]}" + elif command -v rpm-ostree >/dev/null; then + echo "Installing packages with rpm-ostree..." + + sudo rpm-ostree install "${FEDORA_DEPS[@]}" elif command -v dnf >/dev/null; then echo "Installing packages with dnf..." - FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) sudo dnf -y upgrade sudo dnf -y install "${FEDORA_DEPS[@]}" - elif command -v rpm-ostree >/dev/null; then - echo "Installing packages wth rpm-ostree..." - FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) - - sudo rpm-ostree upgrade - sudo rpm-ostree install "${FEDORA_DEPS[@]}" elif command -v zypper >/dev/null; then echo "Installing packages with zypper..." - SUSE_DEPS=(steam jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) sudo zypper --non-interactive up sudo zypper --non-interactive install "${SUSE_DEPS[@]}" elif command -v xbps-install >/dev/null; then echo "Installing packages with xbps..." - VOID_DEPS=(steam jq zenity flatpak unzip bash fuse git rsync whiptail python) sudo xbps-install -Syu sudo xbps-install -Sy "${VOID_DEPS[@]}" diff --git a/install-unstable.sh b/install-unstable.sh index ea6fb53e..a52fd60a 100644 --- a/install-unstable.sh +++ b/install-unstable.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash +DEBIAN_DEPS=(jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) +ARCH_DEPS=(steam jq zenity flatpak unzip bash fuse2 git rsync whiptail python) +FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) +SUSE_DEPS=(steam jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) +VOID_DEPS=(steam jq zenity flatpak unzip bash fuse git rsync whiptail python) + linuxID=$(lsb_release -si) sandbox="" @@ -52,38 +58,31 @@ else if command -v apt-get >/dev/null; then echo "Installing packages with apt..." - DEBIAN_DEPS=(jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) sudo killall apt apt-get sudo apt-get -y update sudo apt-get -y install "${DEBIAN_DEPS[@]}" elif command -v pacman >/dev/null; then echo "Installing packages with pacman..." - ARCH_DEPS=(steam jq zenity flatpak unzip bash fuse2 git rsync whiptail python) sudo pacman --noconfirm -Syu sudo pacman --noconfirm -S "${ARCH_DEPS[@]}" + elif command -v rpm-ostree >/dev/null; then + echo "Installing packages with rpm-ostree..." + + sudo rpm-ostree install "${FEDORA_DEPS[@]}" elif command -v dnf >/dev/null; then echo "Installing packages with dnf..." - FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) sudo dnf -y upgrade sudo dnf -y install "${FEDORA_DEPS[@]}" - elif command -v rpm-ostree >/dev/null; then - echo "Installing packages wth rpm-ostree..." - FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) - - sudo rpm-ostree upgrade - sudo rpm-ostree install "${FEDORA_DEPS[@]}" elif command -v zypper >/dev/null; then echo "Installing packages with zypper..." - SUSE_DEPS=(steam jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) sudo zypper --non-interactive up sudo zypper --non-interactive install "${SUSE_DEPS[@]}" elif command -v xbps-install >/dev/null; then echo "Installing packages with xbps..." - VOID_DEPS=(steam jq zenity flatpak unzip bash fuse git rsync whiptail python) sudo xbps-install -Syu sudo xbps-install -Sy "${VOID_DEPS[@]}" diff --git a/install.sh b/install.sh index a8617d8c..4d35c63d 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash +DEBIAN_DEPS=(jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) +ARCH_DEPS=(steam jq zenity flatpak unzip bash fuse2 git rsync libnewt python) +FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) +SUSE_DEPS=(steam jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) +VOID_DEPS=(steam jq zenity flatpak unzip bash fuse git rsync whiptail python) + linuxID=$(lsb_release -si) sandbox="" @@ -53,38 +59,31 @@ else if command -v apt-get >/dev/null; then echo "Installing packages with apt..." - DEBIAN_DEPS=(jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) sudo killall apt apt-get sudo apt-get -y update sudo apt-get -y install "${DEBIAN_DEPS[@]}" elif command -v pacman >/dev/null; then echo "Installing packages with pacman..." - ARCH_DEPS=(steam jq zenity flatpak unzip bash fuse2 git rsync libnewt python) sudo pacman --noconfirm -Syu sudo pacman --noconfirm -S "${ARCH_DEPS[@]}" + elif command -v rpm-ostree >/dev/null; then + echo "Installing packages with rpm-ostree..." + + sudo rpm-ostree install "${FEDORA_DEPS[@]}" elif command -v dnf >/dev/null; then echo "Installing packages with dnf..." - FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) sudo dnf -y upgrade sudo dnf -y install "${FEDORA_DEPS[@]}" - elif command -v rpm-ostree >/dev/null; then - echo "Installing packages wth rpm-ostree..." - FEDORA_DEPS=(jq zenity flatpak unzip bash fuse git rsync newt python) - - sudo rpm-ostree upgrade - sudo rpm-ostree install "${FEDORA_DEPS[@]}" elif command -v zypper >/dev/null; then echo "Installing packages with zypper..." - SUSE_DEPS=(steam jq zenity flatpak unzip bash libfuse2 git rsync whiptail python) sudo zypper --non-interactive up sudo zypper --non-interactive install "${SUSE_DEPS[@]}" elif command -v xbps-install >/dev/null; then echo "Installing packages with xbps..." - VOID_DEPS=(steam jq zenity flatpak unzip bash fuse git rsync whiptail python) sudo xbps-install -Syu sudo xbps-install -Sy "${VOID_DEPS[@]}"