diff --git a/.cargo/config b/.cargo/config index 27c398ec5..c72a39f1b 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,4 @@ [alias] testrenderer = "test --release -p renderer --" -testconfig = "test --release -p config --" \ No newline at end of file +testconfig = "test --release -p config --" +pubcrates = "publish -p teletypewriter --" \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eb480e86..e4009681e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ # Rio 0.0.1 -- `Teletypewriter` 1.0.2 first release published. \ No newline at end of file +- `Teletypewriter` 1.0.5 usage for macos and linux. \ No newline at end of file diff --git a/README.md b/README.md index e58821c65..6a1d2a6a4 100644 --- a/README.md +++ b/README.md @@ -44,11 +44,9 @@ It also relies on Rust memory behavior, since Rust is a memory-safe language tha The configuration should be the following paths otherwise Rio will use the default configuration. -- macOS path: `~/.config/rio.toml` +- macOS path: `~/.rio/config.toml` -> `$XDG_CONFIG_HOME` defines the base directory relative to which user specific configuration files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty, a default equal to `$HOME/.config` should be used. - -Default configuration of `rio.toml`: +Default configuration of `config.toml`: ```toml # Rio default configuration file diff --git a/ansi-machine/src/lib.rs b/ansi-machine/src/lib.rs index 15c0716c3..3f0b5a97d 100644 --- a/ansi-machine/src/lib.rs +++ b/ansi-machine/src/lib.rs @@ -8,9 +8,8 @@ use std::io::{BufReader, Read}; use std::sync::Arc; use std::sync::Mutex; use teletypewriter::Process; -use vte::ParamsIter; // https://vt100.net/emu/dec_ansi_parser -use vte::{Params, Parser}; +use vte::{Params, ParamsIter, Parser}; pub type Square = crosswords::square::Square; pub type Row = crosswords::row::Row; diff --git a/config/src/lib.rs b/config/src/lib.rs index 31a66cac7..11344a7e1 100644 --- a/config/src/lib.rs +++ b/config/src/lib.rs @@ -119,11 +119,11 @@ impl Config { } pub fn load_macos() -> Self { - // XDG base directory - let base_dir_buffer = dirs::config_dir().unwrap(); + // Home directory + let base_dir_buffer = dirs::home_dir().unwrap(); let base_dir = base_dir_buffer.to_str().unwrap(); - let path = format!("{base_dir}/rio.toml"); + let path = format!("{base_dir}/.rio/config.toml"); if std::path::Path::new(&path).exists() { let content = std::fs::read_to_string(path).unwrap(); match toml::from_str(&content) {