allow different os-releases and hyprland setup #1013

ChrisTitusTech · 2025-02-02T06:23:52Z

Type of Change

Description

Allows new type of tab data that can read files like /etc/os-release to add versioning preconditions for some scripts.

Also adds Hyprland setup script from @JaKooLit

Testing

Cargo run done on ubuntu 24 laptop and an arch linux desktop

Checklist

My code adheres to the coding and style guidelines of the project.
I have performed a self-review of my own code.
I have commented my code, particularly in hard-to-understand areas.
I have made corresponding changes to the documentation.
My changes generate no errors/warnings/merge conflicts.

adamperkowski

i think it might be a better idea to make one script and use

case "$PACKAGER" in
# ...

but that's up to you

core/src/inner.rs

core/tabs/system-setup/debian/hyprland-kool-deb.sh

core/tabs/system-setup/arch/hyprland-kool.sh

core/tabs/system-setup/fedora/hyprland-kool-fed.sh

core/tabs/system-setup/tab_data.toml

core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh

jeevithakannan2 · 2025-02-02T10:52:49Z

core/src/inner.rs

+                        SystemDataType::FileContains { file, contains } => {
+                            std::fs::read_to_string(file)
+                                .map(|content| content.contains(contains) == *matches)
+                                .unwrap_or(false)
+                        }


Isn't this what the previous file precondition was doing? See linux neptune for example

Let me test that out, for some odd reason I thought that was just matching the entire value of the file. It was late and I probably just missed this.

Yes, it iterated through values[] and ensured each was contained within the file.

I feel as though the 'contains' in the FileContains variant also is redundant, given values[] already stores strings to validate.

I would personally keep the previous implementation of the File precondition (perhaps renaming it to FileContains) and create a new FileExists precondition, which would match the pattern with the existing CommandExists.

JaKooLit · 2025-02-02T15:15:59Z

Hi Chris.

Im glad you liked the setup :)

just for clarification, Ubuntu 24.04 hyprland installation is via source and latest Hyprland I could make it work is v0.39

24.10 and 25.04 (beta) have hyprland in their universe repo so can just install via apt

thats the reason why I set a different branch for different Ubuntu release.

so probably best that for Ubuntu, if release is the current 24.04 LTS, to pull from 24.04

Co-authored-by: Adam Perkowski <[email protected]>

ChrisTitusTech · 2025-02-02T18:22:47Z

i think it might be a better idea to make one script and use
case "$PACKAGER" in
# ...
but that's up to you

I need to differentiate between Ubuntu and Debian... Also some scripts can only be run on certain version... like ubuntu 22 vs ubuntu 24. This adds flexibility to those preconditions so it won't allow scripts to run on versions it won't be compatible with.

nnyyxxxx · 2025-02-04T21:55:50Z

core/tabs/system-setup/debian/hyprland-kool-deb.sh

+#!/bin/bash
+
+echo "Hyprland JaKooLit"
+git clone --depth=1 https://github.com/JaKooLit/Debian-Hyprland.git ~/Debian-Hyprland


what happens if cloning fails? maybe due to a wifi problem, or the site could be having problems as seen a couple weeks ago where all git operations suddenly started erroring 404.

Adding error handling for this case would be for the best, since all other commands would also fail.

core/tabs/system-setup/arch/hyprland-kool.sh

core/tabs/system-setup/debian/hyprland-kool-deb.sh

core/tabs/system-setup/arch/hyprland-kool.sh

core/tabs/system-setup/fedora/hyprland-kool-fed.sh

core/tabs/system-setup/debian/hyprland-kool-deb.sh

core/tabs/system-setup/arch/hyprland-kool.sh

nnyyxxxx · 2025-02-04T22:37:29Z

i forgot to review the ubuntu script, just make similar changes there

Co-authored-by: nyx <[email protected]>

…11) * allow different os-releases and hypr setup * Update core/src/inner.rs * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh * refactor: Improve File Contains precondition (ChrisTitusTech#1016) * Update inner.rs (ChrisTitusTech#1021) * Update inner.rs (ChrisTitusTech#1022) * revert to liams commit * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * fix bashisms * Switch to SH from bash --------- Co-authored-by: Chris Titus <[email protected]> Co-authored-by: Adam Perkowski <[email protected]> Co-authored-by: Liam <[email protected]> Co-authored-by: nyx <[email protected]>

…12) * allow different os-releases and hypr setup * Update core/src/inner.rs * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh * refactor: Improve File Contains precondition (ChrisTitusTech#1016) * Update inner.rs (ChrisTitusTech#1021) * Update inner.rs (ChrisTitusTech#1022) * revert to liams commit * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * fix bashisms * Switch to SH from bash --------- Co-authored-by: Chris Titus <[email protected]> Co-authored-by: Adam Perkowski <[email protected]> Co-authored-by: Liam <[email protected]> Co-authored-by: nyx <[email protected]>

…h#1013) (#12)" This reverts commit 25399aa.

…h#1013) (#12)" (#13) This reverts commit 25399aa.

…TitusTech#1013) (#12)"…" This reverts commit 3741b07.

…15) * allow different os-releases and hypr setup * Update core/src/inner.rs * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/tab_data.toml * Update core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh * refactor: Improve File Contains precondition (ChrisTitusTech#1016) * Update inner.rs (ChrisTitusTech#1021) * Update inner.rs (ChrisTitusTech#1022) * revert to liams commit * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/debian/hyprland-kool-deb.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * Update core/tabs/system-setup/arch/hyprland-kool.sh * fix bashisms * Switch to SH from bash --------- Co-authored-by: Chris Titus <[email protected]> Co-authored-by: Adam Perkowski <[email protected]> Co-authored-by: Liam <[email protected]> Co-authored-by: nyx <[email protected]>

allow different os-releases and hypr setup

e009ef0

adamperkowski requested changes Feb 2, 2025

View reviewed changes

adamperkowski added enhancement New feature or request rust Pull requests that update Rust code refactor script Pull requests that update scripts labels Feb 2, 2025

jeevithakannan2 reviewed Feb 2, 2025

View reviewed changes

ChrisTitusTech and others added 9 commits February 2, 2025 12:19

Update core/src/inner.rs

4b72e84

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/debian/hyprland-kool-deb.sh

fc6acb2

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/arch/hyprland-kool.sh

45d2995

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh

b6bb227

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/tab_data.toml

5391ade

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/tab_data.toml

63e0b82

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/tab_data.toml

b977560

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/tab_data.toml

f8900e4

Co-authored-by: Adam Perkowski <[email protected]>

Update core/tabs/system-setup/ubuntu/hyprland-kool-ubuntu24.sh

a776682

Co-authored-by: Adam Perkowski <[email protected]>

lj3954 mentioned this pull request Feb 2, 2025

refactor: Improve File Contains precondition #1016

Merged

4 tasks

lj3954 and others added 4 commits February 4, 2025 12:40

refactor: Improve File Contains precondition (#1016)

c173596

Update inner.rs (#1021)

d872d84

Update inner.rs (#1022)

599ad20

revert to liams commit

9e34347

ChrisTitusTech requested a review from adamperkowski February 4, 2025 19:05

nnyyxxxx reviewed Feb 4, 2025

View reviewed changes

nnyyxxxx suggested changes Feb 4, 2025

View reviewed changes

ChrisTitusTech and others added 3 commits February 5, 2025 11:07

Update core/tabs/system-setup/arch/hyprland-kool.sh

b83cee7

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/debian/hyprland-kool-deb.sh

d69c4e1

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/fedora/hyprland-kool-fed.sh

5731a9b

Co-authored-by: nyx <[email protected]>

ChrisTitusTech and others added 8 commits February 5, 2025 11:07

Update core/tabs/system-setup/arch/hyprland-kool.sh

ad05a0d

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/debian/hyprland-kool-deb.sh

7fa4d2d

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/debian/hyprland-kool-deb.sh

2b17c04

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/arch/hyprland-kool.sh

f37778d

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/arch/hyprland-kool.sh

7ec3333

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/arch/hyprland-kool.sh

6e20e33

Co-authored-by: nyx <[email protected]>

Update core/tabs/system-setup/arch/hyprland-kool.sh

e5fdbff

Co-authored-by: nyx <[email protected]>

fix bashisms

072c08d

nnyyxxxx approved these changes Feb 6, 2025

View reviewed changes

Switch to SH from bash

01535e2

ChrisTitusTech merged commit efa6ff9 into main Feb 6, 2025
6 checks passed

ChrisTitusTech deleted the hyprland-setup branch February 6, 2025 21:14

Jaredy899 added a commit to Jaredy899/linutil that referenced this pull request Feb 7, 2025

Revert "allow different os-releases and hyprland setup (ChrisTitusTec…

7342ea8

…h#1013) (#12)" This reverts commit 25399aa.

Jaredy899 added a commit to Jaredy899/linutil that referenced this pull request Feb 7, 2025

Revert "allow different os-releases and hyprland setup (ChrisTitusTec…

3741b07

…h#1013) (#12)" (#13) This reverts commit 25399aa.

Jaredy899 added a commit to Jaredy899/linutil that referenced this pull request Feb 7, 2025

Revert "Revert "allow different os-releases and hyprland setup (Chris…

2493414

…TitusTech#1013) (#12)"…" This reverts commit 3741b07.

Jaredy899 added a commit to Jaredy899/linutil that referenced this pull request Feb 7, 2025

Revert "Revert "allow different os-releases and hyprland setup (Chris…

81c5b43

…TitusTech#1013) (#12)"…" This reverts commit 3741b07.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

allow different os-releases and hyprland setup #1013

allow different os-releases and hyprland setup #1013

ChrisTitusTech commented Feb 2, 2025

adamperkowski left a comment

jeevithakannan2 Feb 2, 2025

ChrisTitusTech Feb 2, 2025

lj3954 Feb 2, 2025

JaKooLit commented Feb 2, 2025

ChrisTitusTech commented Feb 2, 2025

nnyyxxxx Feb 4, 2025

nnyyxxxx commented Feb 4, 2025

allow different os-releases and hyprland setup #1013

allow different os-releases and hyprland setup #1013

Conversation

ChrisTitusTech commented Feb 2, 2025

Type of Change

Description

Testing

Checklist

adamperkowski left a comment

Choose a reason for hiding this comment

jeevithakannan2 Feb 2, 2025

Choose a reason for hiding this comment

ChrisTitusTech Feb 2, 2025

Choose a reason for hiding this comment

lj3954 Feb 2, 2025

Choose a reason for hiding this comment

JaKooLit commented Feb 2, 2025

ChrisTitusTech commented Feb 2, 2025

nnyyxxxx Feb 4, 2025

Choose a reason for hiding this comment

nnyyxxxx commented Feb 4, 2025