Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure the crates #549

Merged
merged 5 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/bashisms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Check for bashisms
on:
# push:
# paths:
# - tabs/**
# - core/tabs/**
# branches: [ "main" ]
pull_request:
paths:
- tabs/**
- core/tabs/**
merge_group:
workflow_dispatch:

Expand All @@ -24,7 +24,7 @@ jobs:

- name: Check for bashisms in changed files
run: |
for file in $(git diff --name-only origin/${{ github.base_ref }} HEAD tabs); do
for file in $(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs); do
if [[ "$file" == *.sh ]]; then
checkbashisms "$file"
fi
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: ShellCheck
on:
pull_request:
paths:
- 'tabs/**/*.sh'
- 'core/tabs/**/*.sh'
workflow_dispatch:

jobs:
Expand All @@ -15,5 +15,5 @@ jobs:
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
with:
scandir: 'tabs'
scandir: 'core/tabs'
severity: error
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace.package]
license = "MIT"
version = "0.1.0"
version = "24.9.19"

[workspace.dependencies]
ego-tree = "0.6.2"
Expand All @@ -16,4 +16,4 @@ lto = true
codegen-units = 1
panic = "abort"
strip = true
incremental = false
incremental = false
7 changes: 7 additions & 0 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
[package]
name = "linutil_core"
description = "The backend of Linutil."
repository = "https://github.com/ChrisTitusTech/linutil/tree/main/core"
edition = "2021"
version.workspace = true
license.workspace = true
include = [
"src/*.rs",
"Cargo.toml",
"tabs/**",
]

[dependencies]
include_dir = "0.7.4"
Expand Down
2 changes: 1 addition & 1 deletion core/src/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use serde::Deserialize;
use std::path::{Path, PathBuf};
use tempdir::TempDir;

const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/../tabs");
const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/tabs");

pub fn get_tabs(validate: bool) -> Vec<Tab> {
let tab_files = TabList::get_tabs();
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 13 additions & 3 deletions tui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
[package]
name = "linutil_tui"
description = "Chris Titus Tech's Linux Toolbox - Linutil is a distro-agnostic toolbox designed to simplify everyday Linux tasks."
documentation = "https://christitustech.github.io/linutil"
readme = "../README.md"
edition = "2021"
version.workspace = true
license.workspace = true
repository = "https://github.com/ChrisTitusTech/linutil/tree/main/tui"
version.workspace = true
include = [
"src/*.rs",
"Cargo.toml",
"build.rs",
]
build = "build.rs"

[dependencies]
clap = { version = "4.5.16", features = ["derive"] }
Expand All @@ -13,11 +23,11 @@ portable-pty = "0.8.1"
ratatui = "0.28.1"
tui-term = "0.1.12"
unicode-width = "0.1.13"
linutil_core = { path = "../core" }
linutil_core = { path = "../core", version = "24.9.19" }

[build-dependencies]
chrono = "0.4.33"

[[bin]]
name = "linutil"
path = "src/main.rs"
path = "src/main.rs"
Loading