BIG CHANGES

.github/workflows/bashisms.yml

@@ -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:
 
@@ -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

.github/workflows/shellcheck.yml

@@ -3,7 +3,7 @@ name: ShellCheck
 on:
   pull_request:
     paths:
-      - 'tabs/**/*.sh'
+      - 'core/tabs/**/*.sh'
   workflow_dispatch:
 
 jobs:
@@ -15,5 +15,5 @@ jobs:
     - name: Run ShellCheck
       uses: ludeeus/action-shellcheck@master
       with:
-        scandir: 'tabs'
+        scandir: 'core/tabs'
         severity: error

Cargo.toml

@@ -1,14 +1,43 @@
 [workspace.package]
 license = "MIT"
-version = "0.1.0"
+version = "24.9.19"
 
 [workspace.dependencies]
 ego-tree = "0.6.2"
 
 [workspace]
-members = ["tui", "core"]
+members = ["core"]
 resolver = "2"
 
+[package]
+name = "linutil"
+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"
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/ChrisTitusTech/linutil"
+version.workspace = true
+include = [
+    "src/*.rs",
+    "Cargo.toml",
+    "build.rs",
+]
+build = "build.rs"
+
+[dependencies]
+clap = { version = "4.5.16", features = ["derive"] }
+crossterm = "0.28.1"
+ego-tree = { workspace = true }
+oneshot = "0.1.8"
+portable-pty = "0.8.1"
+ratatui = "0.28.1"
+tui-term = "0.1.12"
+unicode-width = "0.1.13"
+linutil_core = { path = "./core", version = "24.9.19" }
+
+[build-dependencies]
+chrono = "0.4.33"
+
 [profile.release]
 opt-level = "z"
 debug = false
@@ -17,3 +46,7 @@ codegen-units = 1
 panic = "abort"
 strip = true
 incremental = false
+
+[[bin]]
+name = "linutil"
+path = "src/main.rs"

core/Cargo.toml

@@ -3,6 +3,11 @@ name = "linutil_core"
 edition = "2021"
 version.workspace = true
 license.workspace = true
+include = [
+    "src/*.rs",
+    "Cargo.toml",
+    "tabs/**",
+]
 
 [dependencies]
 include_dir = "0.7.4"

core/src/inner.rs

@@ -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();