From 04d97e40763e4761c78aa4e08732e1ca07209365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Jir=C3=A1k?= <77530871+JirakLu@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:47:48 +0200 Subject: [PATCH 1/6] fix: multilib check in gaming setup (#689) --- core/tabs/system-setup/gaming-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index 0e2782b8..1f88e93e 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -9,7 +9,7 @@ installDepend() { case "$PACKAGER" in pacman) #Check for multilib - if ! grep -q "^\s*$$multilib$$" /etc/pacman.conf; then + if ! grep -q "^\s*\[multilib\]" /etc/pacman.conf; then echo "[multilib]" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf echo "Include = /etc/pacman.d/mirrorlist" | "$ESCALATION_TOOL" tee -a /etc/pacman.conf "$ESCALATION_TOOL" "$PACKAGER" -Syu From 2e533cddf964a124de83d9dd74fd10160f0acb33 Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Sat, 28 Sep 2024 20:52:51 +0200 Subject: [PATCH 2/6] Non-interactive `sh.rustup.rs`, DNF & `*` fixes (#669) --- core/tabs/applications-setup/linutil-installer.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/tabs/applications-setup/linutil-installer.sh b/core/tabs/applications-setup/linutil-installer.sh index 63f9f836..28e180e0 100755 --- a/core/tabs/applications-setup/linutil-installer.sh +++ b/core/tabs/applications-setup/linutil-installer.sh @@ -37,13 +37,17 @@ installLinutil() { pacman) "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm rustup ;; + dnf) + "$ESCALATION_TOOL" "$PACKAGER" install -y rustup + ;; zypper) "$ESCALATION_TOOL" "$PACKAGER" install -n curl gcc make - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y . $HOME/.cargo/env ;; *) - "$ESCALATION_TOOL" "$PACKAGER" install -y rustup + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + . $HOME/.cargo/env ;; esac fi @@ -59,4 +63,4 @@ installLinutil() { checkEnv checkEscalationTool checkAURHelper -installLinutil \ No newline at end of file +installLinutil From 84a66c79d91d9aea63ad3c4060e98eaf9bffb43c Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Sat, 28 Sep 2024 20:54:24 +0200 Subject: [PATCH 3/6] Fixed vscode on Arch (#663) --- core/tabs/applications-setup/Developer-tools/vscode-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/Developer-tools/vscode-setup.sh b/core/tabs/applications-setup/Developer-tools/vscode-setup.sh index 539aac45..018616a6 100644 --- a/core/tabs/applications-setup/Developer-tools/vscode-setup.sh +++ b/core/tabs/applications-setup/Developer-tools/vscode-setup.sh @@ -21,7 +21,7 @@ installVsCode() { "$ESCALATION_TOOL" "$PACKAGER" --non-interactive install code ;; pacman) - "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm code + "$AUR_HELPER" -S --needed --noconfirm visual-studio-code-bin ;; dnf) "$ESCALATION_TOOL" rpm --import https://packages.microsoft.com/keys/microsoft.asc @@ -40,4 +40,5 @@ installVsCode() { checkEnv checkEscalationTool +checkAURHelper installVsCode From 2d1e45a41f4f42a99a91f2edab2c69f5ccd10ea8 Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Sat, 28 Sep 2024 20:56:09 +0200 Subject: [PATCH 4/6] Fix AutoLogin `printf` and `>` issues (#662) * Fixed printf and tee errors * Fixed more * Changed to sed '' for BSD compatibility Co-authored-by: cartercanedy Co-authored-by: nnyyxxxx --------- Co-authored-by: cartercanedy Co-authored-by: nnyyxxxx --- core/tabs/utils/auto-login.sh | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/core/tabs/utils/auto-login.sh b/core/tabs/utils/auto-login.sh index 3571f74f..561250d5 100644 --- a/core/tabs/utils/auto-login.sh +++ b/core/tabs/utils/auto-login.sh @@ -43,9 +43,9 @@ configure_lightdm() { printf "%b" "Enter username for LightDM autologin: " read -r user - "$ESCALATION_TOOL" "printf '[Seat:*]' > /etc/lightdm/lightdm.conf.d/50-autologin.conf" - "$ESCALATION_TOOL" "printf 'autologin-user=$user' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf" - "$ESCALATION_TOOL" "printf 'autologin-user-timeout=0' >> /etc/lightdm/lightdm.conf.d/50-autologin.conf" + printf "%b\n" '[Seat:*]' | "$ESCALATION_TOOL" tee -a /etc/lightdm/lightdm.conf + printf "%s\n" "autologin-user=$user" | "$ESCALATION_TOOL" tee -a /etc/lightdm/lightdm.conf + printf "%b\n" 'autologin-user-timeout=0' | "$ESCALATION_TOOL" tee -a /etc/lightdm/lightdm.conf printf "%b\n" "LightDM has been configured for autologin." } @@ -53,7 +53,8 @@ configure_lightdm() { # Function to remove LightDM autologin remove_lightdm_autologin() { printf "%b\n" "Removing LightDM autologin configuration..." - "$ESCALATION_TOOL" rm -f /etc/lightdm/lightdm.conf.d/50-autologin.conf + "$ESCALATION_TOOL" sed -i'' '/^\[Seat:\*]/d' /etc/lightdm/lightdm.conf + "$ESCALATION_TOOL" sed -i'' '/^autologin-/d' /etc/lightdm/lightdm.conf printf "%b\n" "LightDM autologin configuration has been removed." } @@ -63,9 +64,9 @@ configure_gdm() { printf "%b" "Enter username for GDM autologin: " read -r user - "$ESCALATION_TOOL" "printf '[daemon]' > /etc/gdm/custom.conf" - "$ESCALATION_TOOL" "printf 'AutomaticLoginEnable = true' >> /etc/gdm/custom.conf" - "$ESCALATION_TOOL" "printf 'AutomaticLogin = $user' >> /etc/gdm/custom.conf" + printf "%b\n" '[daemon]' | "$ESCALATION_TOOL" tee -a /etc/gdm/custom.conf + printf "%b\n" 'AutomaticLoginEnable = true' | "$ESCALATION_TOOL" tee -a /etc/gdm/custom.conf + printf "%s\n" "AutomaticLogin = $user" | "$ESCALATION_TOOL" tee -a /etc/gdm/custom.conf printf "%b\n" "GDM has been configured for autologin." } @@ -73,8 +74,8 @@ configure_gdm() { # Function to remove GDM autologin remove_gdm_autologin() { printf "%b\n" "Removing GDM autologin configuration..." - "$ESCALATION_TOOL" sed -i '/AutomaticLoginEnable/d' /etc/gdm/custom.conf - "$ESCALATION_TOOL" sed -i '/AutomaticLogin/d' /etc/gdm/custom.conf + "$ESCALATION_TOOL" sed -i'' '/AutomaticLoginEnable/d' /etc/gdm/custom.conf + "$ESCALATION_TOOL" sed -i'' '/AutomaticLogin/d' /etc/gdm/custom.conf printf "%b\n" "GDM autologin configuration has been removed." } @@ -85,9 +86,9 @@ configure_sddm() { read -r user list_sessions # Show session options - "$ESCALATION_TOOL" "printf '[Autologin]' > /etc/sddm.conf" - "$ESCALATION_TOOL" "printf 'User=$user' >> /etc/sddm.conf" - "$ESCALATION_TOOL" "printf 'Session=$session' >> /etc/sddm.conf" + printf "%b\n" '[Autologin]' | "$ESCALATION_TOOL" tee -a /etc/sddm.conf + printf "%s\n" "User=$user" | "$ESCALATION_TOOL" tee -a /etc/sddm.conf + printf "%s\n" "Session=$session" | "$ESCALATION_TOOL" tee -a /etc/sddm.conf printf "%b\n" "SDDM has been configured for autologin." } @@ -95,7 +96,7 @@ configure_sddm() { # Function to remove SDDM autologin remove_sddm_autologin() { printf "%b\n" "Removing SDDM autologin configuration..." - "$ESCALATION_TOOL" sed -i '/\[Autologin\]/,+2d' /etc/sddm.conf + "$ESCALATION_TOOL" sed -i'' '/\[Autologin\]/,+2d' /etc/sddm.conf printf "%b\n" "SDDM autologin configuration has been removed." } @@ -106,8 +107,8 @@ configure_lxdm() { read -r user list_sessions # Show session options - "$ESCALATION_TOOL" sed -i "s/^#.*autologin=.*$/autologin=${user}/" /etc/lxdm/lxdm.conf - "$ESCALATION_TOOL" sed -i "s|^#.*session=.*$|session=/usr/bin/${session}|; s|^session=.*$|session=/usr/bin/${session}|" /etc/lxdm/lxdm.conf + "$ESCALATION_TOOL" sed -i'' "s/^#.*autologin=.*$/autologin=${user}/" /etc/lxdm/lxdm.conf + "$ESCALATION_TOOL" sed -i'' "s|^#.*session=.*$|session=/usr/bin/${session}|; s|^session=.*$|session=/usr/bin/${session}|" /etc/lxdm/lxdm.conf printf "%b\n" "LXDM has been configured for autologin." } @@ -115,8 +116,8 @@ configure_lxdm() { # Function to remove LXDM autologin remove_lxdm_autologin() { printf "%b\n" "Removing LXDM autologin configuration..." - "$ESCALATION_TOOL" sed -i "s/^autologin=.*$/#autologin=/" /etc/lxdm/lxdm.conf - "$ESCALATION_TOOL" sed -i "s/^session=.*$/#session=/" /etc/lxdm/lxdm.conf + "$ESCALATION_TOOL" sed -i'' "s/^autologin=.*$/#autologin=/" /etc/lxdm/lxdm.conf + "$ESCALATION_TOOL" sed -i'' "s/^session=.*$/#session=/" /etc/lxdm/lxdm.conf printf "%b\n" "LXDM autologin configuration has been removed." } From c7622d8be7fef90b5d3d8b24c14707efaf3d600f Mon Sep 17 00:00:00 2001 From: Nightmare1984 <55515815+Nightmare1984@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:59:41 -0400 Subject: [PATCH 5/6] updating Gaming For Fedora 41 (#681) * updating Gaming For Fedora 41 Red Hat Already Has OpenH264 Installed When You Update To Fedora 41 * Made Change's So Can Work With Fedora 41 And Older * Update core/tabs/system-setup/gaming-setup.sh Co-authored-by: Adam Perkowski * Update core/tabs/system-setup/gaming-setup.sh Co-authored-by: Nyx <144965845+nnyyxxxx@users.noreply.github.com> --------- Co-authored-by: Adam Perkowski Co-authored-by: Nyx <144965845+nnyyxxxx@users.noreply.github.com> --- core/tabs/system-setup/gaming-setup.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index 1f88e93e..86ad21aa 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -36,9 +36,15 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" "$DISTRO_DEPS" ;; dnf) - "$ESCALATION_TOOL" "$PACKAGER" install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm -y - "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 -y - "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + if [ "$(rpm -E %fedora)" -le 41 ]; then + "$ESCALATION_TOOL" "$PACKAGER" install ffmpeg ffmpeg-libs -y + "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + else + printf "%b\n" "${CYAN}Fedora < 41 detected. Installing rpmfusion repos.${RC}" + "$ESCALATION_TOOL" "$PACKAGER" install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-"$(rpm -E %fedora)".noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-"$(rpm -E %fedora)".noarch.rpm -y + "$ESCALATION_TOOL" "$PACKAGER" config-manager --enable fedora-cisco-openh264 -y + "$ESCALATION_TOOL" "$PACKAGER" install -y "$DEPENDENCIES" + fi ;; zypper) "$ESCALATION_TOOL" "$PACKAGER" -n install "$DEPENDENCIES" From ce2d2d0ec9ff6e559c3f9e3559592d5ed28034b6 Mon Sep 17 00:00:00 2001 From: CarsBeck <140343231+CarsBeck@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:00:20 -0400 Subject: [PATCH 6/6] Add descriptions to the Applications Setup section and Auto Mount Drive (#680) * Add description for Bottles * Add description for Auto Mount Drive * Add description for Docker * Add description for Grub Theme Setup --- core/tabs/applications-setup/tab_data.toml | 3 +++ core/tabs/utils/tab_data.toml | 1 + 2 files changed, 4 insertions(+) diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index f5ed12e5..9af2ee4f 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -110,6 +110,7 @@ task_list = "I FM" [[data]] name = "Bottles" +description = "Bottles allows Windows software, like applications and games, to run on Linux.\nBottles also provides tools to categorize, organize and optimize your applications." script = "bottles-setup.sh" task_list = "FI" @@ -127,6 +128,7 @@ task_list = "I PFM SS" [[data]] name = "Docker" +description = "Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers." script = "docker-setup.sh" task_list = "I SS" @@ -144,6 +146,7 @@ task_list = "I" [[data]] name = "Grub Theme" +description = "Installs ChrisTitusTech's Top 5 Bootloader Themes script to allow for easy customization of GRUB." script = "grub-theme.sh" task_list = "PFM" diff --git a/core/tabs/utils/tab_data.toml b/core/tabs/utils/tab_data.toml index 4b641147..7cfc3ed7 100644 --- a/core/tabs/utils/tab_data.toml +++ b/core/tabs/utils/tab_data.toml @@ -95,6 +95,7 @@ script = "user-account-manager/remove_from_group.sh" [[data]] name = "Auto Mount Drive" +description = "This utility is designed to help with automating the process of mounting a drive on to your system." script = "auto-mount.sh" task_list = "PFM"