From 91955d12524ad4a3977c32ba413c3923fcde8864 Mon Sep 17 00:00:00 2001 From: Justine Date: Mon, 20 Feb 2023 17:42:01 +0100 Subject: [PATCH] Change sqishrc.yaml to sqishrc --- Cargo.lock | 83 +++++++++++++++++++++++++++++++++-------- README.md | 2 +- sqishrc.yaml => sqishrc | 3 +- src/shell/config.rs | 4 +- 4 files changed, 72 insertions(+), 20 deletions(-) rename sqishrc.yaml => sqishrc (92%) diff --git a/Cargo.lock b/Cargo.lock index f8c422e..d3fe21b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,6 +23,16 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "ctrlc" +version = "3.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" +dependencies = [ + "nix", + "windows-sys", +] + [[package]] name = "dirs" version = "4.0.0" @@ -97,6 +107,18 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "static_assertions", +] + [[package]] name = "numtoa" version = "0.1.0" @@ -177,6 +199,7 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" name = "sqish" version = "1.0.0" dependencies = [ + "ctrlc", "dirs", "gethostname", "regex", @@ -187,6 +210,12 @@ dependencies = [ "yaml-rust", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "syn" version = "1.0.105" @@ -308,46 +337,70 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "yaml-rust" diff --git a/README.md b/README.md index fb5891e..e68c1d7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ TODO: * Can't cd to a directory containing spaces in its name ## sqishrc (Config) -See the included sqishrc.yaml.example file included, and copy it as ~/.sqishrc.yaml +See the included sqishrc file included, and copy it as ~/.sqishrc ## Built-in shortcuts ### As Hotkeys diff --git a/sqishrc.yaml b/sqishrc similarity index 92% rename from sqishrc.yaml rename to sqishrc index 1e17ca7..bd88efa 100644 --- a/sqishrc.yaml +++ b/sqishrc @@ -1,6 +1,5 @@ --- -#This is an example sqishrc. to be copied and modified as ~/.sqishirc.yaml (not .yml, -#I can't be bothered to deal with 2 different extensions). +#This is an example sqishrc. to be copied and modified as ~/.sqishrc # #Prompt: Defines the promptline. Values are defined in all-caps, between $ and _. #Possible values: diff --git a/src/shell/config.rs b/src/shell/config.rs index bc850ba..ea33f90 100644 --- a/src/shell/config.rs +++ b/src/shell/config.rs @@ -25,12 +25,12 @@ impl SqishConf { return Err(String::from("Home dir could not be determined.")); }, }; - conf_path.push(".sqishrc.yaml"); + conf_path.push(".sqishrc"); let sqishrc_file = match fs::read_to_string(conf_path) { Ok(s) => s, Err(_) => { - return Err(String::from("Could not read ~/.sqishrc.yaml")); + return Err(String::from("Could not read ~/.sqishrc")); }, };