From 1fbd8f7e2ecfb9344c7ea132995f1e9db54031a7 Mon Sep 17 00:00:00 2001 From: Unbewohnte Date: Tue, 7 Sep 2021 10:35:20 +0300 Subject: [PATCH] Appropriate installation directory --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- install.sh | 4 ++-- src/main.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3552f4a..3172170 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,7 +45,7 @@ dependencies = [ [[package]] name = "fumosay" -version = "0.4.0" +version = "0.4.1" dependencies = [ "clap", ] diff --git a/Cargo.toml b/Cargo.toml index a2286b9..cd5980f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fumosay" -version = "0.4.1" +version = "0.4.2" edition = "2018" authors = ["Unbewohnte | Nikolay Kasyanov "] description = "Like cowsay, but with soft friends" @@ -10,4 +10,4 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = "~2.33.3" \ No newline at end of file +clap = "~2.33.3" diff --git a/install.sh b/install.sh index d8d33d6..7c2e76c 100755 --- a/install.sh +++ b/install.sh @@ -1,8 +1,8 @@ #!/bin/bash # fumosay installation script -FUMOSAY_BIN_DIR_PATH=/usr/bin/ -FUMOFILES_DIR_PATH=/usr/share/fumosay/fumofiles/ +FUMOSAY_BIN_DIR_PATH=/usr/local/bin/ +FUMOFILES_DIR_PATH=/usr/local/share/fumosay/fumofiles/ # create directories mkdir -p $FUMOSAY_BIN_DIR_PATH && mkdir -p $FUMOFILES_DIR_PATH diff --git a/src/main.rs b/src/main.rs index ae53b3c..a32bd57 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,7 +7,7 @@ const MESSAGE_INDICATOR: &str = "!message"; /// Fumofile name of the default fumo const FUMO_DEFAULT: &str = "cirno.fumo"; /// Default directory where fumofiles are placed -const DEFAULT_FUMOFILES_DIR: &str = "/usr/share/fumosay/fumofiles/"; +const DEFAULT_FUMOFILES_DIR: &str = "/usr/local/share/fumosay/fumofiles/"; /// Returns a resulting string with `MESSAGE_INDICATOR` replaced with given /// `message`. If `MESSAGE_INDICATOR` is not present in fumofile - the @@ -22,7 +22,7 @@ fn process_message(fumofile_contents: &mut String, message: &str) -> String { fn main() { // get command line arguments let matches = App::new("fumosay") - .version("0.4.1") + .version("0.4.2") .author("Unbewohnte | Nikolay Kasyanov ") .about("cowsay, but with soft friends") .arg(