From 96876d673a91eeff7617fdd5b3b3cc5f0395133f Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Fri, 27 Sep 2024 21:51:43 +0200 Subject: [PATCH] fixed some stuff that's not supposed to be here Co-authored-by: nnyyxxxx --- core/tabs/system-setup/arch/linux-neptune.sh | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/core/tabs/system-setup/arch/linux-neptune.sh b/core/tabs/system-setup/arch/linux-neptune.sh index d3f98d418..cc2f2e58c 100755 --- a/core/tabs/system-setup/arch/linux-neptune.sh +++ b/core/tabs/system-setup/arch/linux-neptune.sh @@ -1,44 +1,44 @@ -#! /bin/sh -e +#!/bin/sh -e . ../../common-script.sh setUpRepos() { if ! grep -q "^\s*$$jupiter-staging$$" /etc/pacman.conf; then - printf "%b\n" "${CYAN}Adding jupiter-staging to pacman repositories...${RC}" + printf "%b\n" "${CYAN}Adding jupiter-staging to pacman repositories...${RC}" echo "[jupiter-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf - echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf - echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf + echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf + echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf fi if ! grep -q "^\s*$$holo-staging$$" /etc/pacman.conf; then - printf "%b\n" "${CYAN}Adding holo-staging to pacman repositories...${RC}" - echo "[holo-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf - echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf - echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf + printf "%b\n" "${CYAN}Adding holo-staging to pacman repositories...${RC}" + echo "[holo-staging]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf + echo "Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/\$repo/os/\$arch" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf + echo "SigLevel = Never" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf fi } installKernel() { if ! "$PACKAGER" -Q | grep -q "\blinux-neptune"; then - printf "%b\n" "${CYAN}Installing linux-neptune..." + printf "%b\n" "${CYAN}Installing linux-neptune..." "$ESCALATION_TOOL" "$PACKAGER" -Syyu --noconfirm "$ESCALATION_TOOL" "$PACKAGER" -S --noconfirm linux-neptune linux-neptune-headers - "$ESCALATION_TOOL" mkinitcpio -P + "$ESCALATION_TOOL" mkinitcpio -P else - printf "%b\n" "${GREEN}linux-neptune detected. Skipping installation.${RC}" + printf "%b\n" "${GREEN}linux-neptune detected. Skipping installation.${RC}" fi if [ -f /etc/default/grub ]; then - printf "%b\n" "${CYAN}Updating GRUB...${RC}" - if ! grep -q '^UPDATEDEFAULT=' /etc/default/grub; then - echo 'UPDATEDEFAULT=yes' | sudo tee -a /etc/default/grub - else - sudo sed -i 's/^UPDATEDEFAULT=.*/UPDATEDEFAULT=yes/' /etc/default/grub - fi - if [ -f /boot/grub/grub.cfg ]; then - "$ESCALATION_TOOL" grub-mkconfig -o /boot/grub/grub.cfg - else - printf "%b\n" "${RED}GRUB configuration file not found. Run grub-mkconfig manually.${RC}" - fi + printf "%b\n" "${CYAN}Updating GRUB...${RC}" + if ! grep -q '^UPDATEDEFAULT=' /etc/default/grub; then + echo 'UPDATEDEFAULT=yes' | "$ESCALATION_TOOL" tee -a /etc/default/grub + else + "$ESCALATION_TOOL" sed -i 's/^UPDATEDEFAULT=.*/UPDATEDEFAULT=yes/' /etc/default/grub + fi + if [ -f /boot/grub/grub.cfg ]; then + "$ESCALATION_TOOL" grub-mkconfig -o /boot/grub/grub.cfg + else + printf "%b\n" "${RED}GRUB configuration file not found. Run grub-mkconfig manually.${RC}" + fi else printf "%b\n" "${RED}GRUB not detected. Manually set your bootloader to use linux-neptune.${RC}" fi