Skip to content

Commit ee6b604

Browse files
authored
Merge branch 'main' into bottles-install-script
2 parents 4471ebb + 596f278 commit ee6b604

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2725
-719
lines changed

.github/CONTRIBUTING.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,28 @@ cd linutil
4040
- **Make small, targeted PRs**: Focus on one feature or fix per pull request. This makes it easier to review and increases the likelihood of acceptance.
4141
- **Avoid combining unrelated changes**: PRs that tackle multiple unrelated issues are harder to review and might be rejected because of a single problem.
4242

43-
## 8. Code Review and Feedback
43+
## 8. Understand and Test the Code You Write
44+
45+
- **Review your code**: Before submitting your changes, take the time to review your code for readability, efficiency and performance. Consider how your changes affect the project.
46+
- **Avoid using LLMs**: Don't submit AI-generated code without reviewing and testing it first. Ensure that any code you submit is thoroughly understood and meets the project's standards.
47+
- **Testing Requirements**: Failure to conduct testing after multiple requests may result in the closure of your Pull Request.
48+
49+
## 9. Code Review and Feedback
4450

4551
- **Expect feedback**: PRs will undergo code review. Be open to feedback and willing to make adjustments as needed.
4652
- **Participate in reviews**: If you feel comfortable, review other contributors' PRs as well. Peer review is a great way to learn and ensure high-quality contributions.
4753

48-
## 9. Contributing Is More Than Just Code
54+
## 10. Contributing Is More Than Just Code
4955

5056
- **Test the tool**: Running tests and providing feedback on how the tool works in different environments is a valuable contribution.
5157
- **Write well-formed issues**: Clearly describe bugs or problems you encounter, providing as much detail as possible, including steps to reproduce the issue.
5258
- **Propose reasonable feature requests**: When suggesting new features, ensure they fit within the scope, style, and design of the project. Provide clear reasoning and use cases.
5359

54-
## 10. Documentation
60+
## 11. Documentation
5561

5662
- **Update the documentation**: If your change affects the functionality, please update the relevant documentation files to reflect this.
5763

58-
## 11. License
64+
## 12. License
5965

6066
- **Agree to the license**: By contributing to Linutil, you agree that your contributions will be licensed under the project's MIT license.
6167

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ If applicable, add screenshots to help explain your problem.
2424

2525
## Additional context
2626
Add any other context about the problem here.
27+
28+
## Checklist
29+
- [ ] I checked for duplicate issues.
30+
- [ ] I checked already existing discussions.
31+
- [ ] This issue is not included in the roadmap.
32+
- [ ] This issue is present on both stable and development branches.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@ about: Suggest an idea for this project
44
title: ''
55
labels: 'enhancement'
66
assignees: ''
7-
87
---
98

10-
**Is your feature request related to a problem? Please describe.**
9+
## Is your feature request related to a problem? Please describe.
1110
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
1211

13-
**Describe the solution you'd like**
12+
## Describe the solution you'd like
1413
A clear and concise description of what you want to happen.
1514

16-
**Describe alternatives you've considered**
15+
## Describe alternatives you've considered
1716
A clear and concise description of any alternative solutions or features you've considered.
1817

19-
**Additional context**
18+
## Additional context
2019
Add any other context or screenshots about the feature request here.
20+
21+
## Checklist
22+
- [ ] I checked for duplicate issues.
23+
- [ ] I checked already existing discussions.
24+
- [ ] This feature is not included in the roadmap.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Pull Request
2-
3-
## Title
4-
<!--[Provide a succinct and descriptive title for the pull request.]-->
1+
<!--
2+
Read Contributing Guidelines before opening a PR.
3+
https://github.com/ChrisTitusTech/linutil/blob/main/.github/CONTRIBUTING.md
4+
-->
55

66
## Type of Change
77
- [ ] New feature
88
- [ ] Bug fix
9-
- [ ] Documentation Update
9+
- [ ] Documentation update
1010
- [ ] Refactoring
1111
- [ ] Hotfix
1212
- [ ] Security patch
@@ -21,7 +21,7 @@
2121
## Impact
2222
<!--[Discuss the impact of your changes on the project. This might include effects on performance, new dependencies, or changes in behaviour.]-->
2323

24-
## Issue related to PR
24+
## Issues / other PRs related
2525
<!--[What issue/discussion is related to this PR (if any)]-->
2626
- Resolves #
2727

.github/workflows/bashisms.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Check for bashisms
2+
3+
on:
4+
push:
5+
paths:
6+
- tabs/**
7+
branches: [ "main" ]
8+
pull_request:
9+
paths:
10+
- tabs/**
11+
merge_group:
12+
workflow_dispatch:
13+
14+
jobs:
15+
check-bashisms:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
21+
- name: Install devscripts
22+
run: sudo apt-get update && sudo apt-get install devscripts
23+
24+
- name: Check for bashisms
25+
working-directory: tabs
26+
run: find . -name '*.sh' | xargs -P 4 -n 1 checkbashisms

.github/workflows/pr-labels.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/rust.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: Rust Checks
33
on:
44
pull_request:
55
branches: ["main"]
6+
paths:
7+
- '**/*.rs'
8+
- 'Cargo.toml'
9+
- 'Cargo.lock'
610

711
env:
812
CARGO_TERM_COLOR: always

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
![GitHub Downloads (specific asset, all releases)](https://img.shields.io/github/downloads/ChrisTitusTech/linutil/linutil?label=Total%20Downloads&style=for-the-badge)
55
[![](https://dcbadge.limes.pink/api/server/https://discord.gg/bujFYKAHSp)](https://discord.gg/bujFYKAHSp)
66

7+
<!-- TODO: crates.io package here + <br> -->
8+
[![linutil AUR Version](https://img.shields.io/aur/version/linutil?style=for-the-badge&label=%5BAUR%5D%20linutil&color=%23230567ff)](https://aur.archlinux.org/packages/linutil) [![linutil-bin AUR Version](https://img.shields.io/aur/version/linutil-bin?style=for-the-badge&label=%5BAUR%5D%20linutil-bin&color=%23230567ff)](https://aur.archlinux.org/packages/linutil-bin)
9+
710
![Preview](docs/assets/preview.png)
811

912
**Linutil** is a distro-agnostic toolbox designed to simplify everyday Linux tasks. It helps you set up applications and optimize your system for specific use cases. The utility is actively developed in Rust 🦀, providing performance and reliability.

core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license.workspace = true
77
[dependencies]
88
include_dir = "0.7.4"
99
tempdir = "0.3.7"
10-
serde = { version = "1.0.205", features = ["derive"] }
11-
toml = "0.8.19"
10+
serde = { version = "1.0.205", features = ["derive"], default-features = false }
11+
toml = { version = "0.8.19", features = ["parse"], default-features = false }
1212
which = "6.0.3"
1313
ego-tree = { workspace = true }

core/src/inner.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pub fn get_tabs(validate: bool) -> Vec<Tab> {
2424
.map(|(TabEntry { name, data }, directory)| {
2525
let mut tree = Tree::new(ListNode {
2626
name: "root".to_string(),
27+
description: "".to_string(),
2728
command: Command::None,
2829
});
2930
let mut root = tree.root_mut();
@@ -146,12 +147,14 @@ fn create_directory(data: Vec<Entry>, node: &mut NodeMut<ListNode>, command_dir:
146147
if let Some(entries) = entry.entries {
147148
let mut node = node.append(ListNode {
148149
name: entry.name,
150+
description: entry.description,
149151
command: Command::None,
150152
});
151153
create_directory(entries, &mut node, command_dir);
152154
} else if let Some(command) = entry.command {
153155
node.append(ListNode {
154156
name: entry.name,
157+
description: entry.description,
155158
command: Command::Raw(command),
156159
});
157160
} else if let Some(script) = entry.script {
@@ -161,6 +164,7 @@ fn create_directory(data: Vec<Entry>, node: &mut NodeMut<ListNode>, command_dir:
161164
}
162165
node.append(ListNode {
163166
name: entry.name,
167+
description: entry.description,
164168
command: Command::LocalFile(dir),
165169
});
166170
} else {

0 commit comments

Comments
 (0)