feat: v0.1.3 add *.src file
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -128,7 +128,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "runrs"
|
||||
version = "0.1.2"
|
||||
version = "0.1.3"
|
||||
dependencies = [
|
||||
"rust_util",
|
||||
"sha256",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "runrs"
|
||||
version = "0.1.2"
|
||||
version = "0.1.3"
|
||||
edition = "2018"
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Run Rust Scripts"
|
||||
|
||||
18
src/main.rs
18
src/main.rs
@@ -1,6 +1,7 @@
|
||||
#[macro_use]
|
||||
extern crate rust_util;
|
||||
|
||||
use std::{env, fs};
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
|
||||
@@ -8,7 +9,7 @@ use rust_util::util_msg;
|
||||
use rust_util::util_msg::MessageType;
|
||||
|
||||
fn main() {
|
||||
let home = std::env::var("HOME").unwrap_or_else(|_|
|
||||
let home = env::var("HOME").unwrap_or_else(|_|
|
||||
failure_and_exit!("$HOME not found!")
|
||||
);
|
||||
let rust_script = PathBuf::from(format!("{}/.cargo/bin/rust-script", home));
|
||||
@@ -23,7 +24,7 @@ fn main() {
|
||||
// }
|
||||
failure_and_exit!("Need install rust-script tool, https://git.hatter.ink/hatter/runrs/src/branch/master/external/rust-script");
|
||||
}
|
||||
let args = std::env::args().skip(1).collect::<Vec<_>>();
|
||||
let args = env::args().skip(1).collect::<Vec<_>>();
|
||||
if args.is_empty() {
|
||||
failure_and_exit!(
|
||||
"runrs v{}, need arguments, e.g.\n\nrunrs <script.rs> [arguments]\n",
|
||||
@@ -52,7 +53,7 @@ runrs <script.rs> [arguments]
|
||||
}
|
||||
|
||||
let script_file = first_argument;
|
||||
let script_content = match std::fs::read_to_string(script_file) {
|
||||
let script_content = match fs::read_to_string(script_file) {
|
||||
Err(e) => failure_and_exit!("Read file: {}, failed: {}", script_file, e),
|
||||
Ok(c) => c,
|
||||
};
|
||||
@@ -61,11 +62,20 @@ runrs <script.rs> [arguments]
|
||||
let cache_script_bin_name = format!("{}/Library/Caches/rust-script/binaries/release/{}",
|
||||
home,
|
||||
script_sha256);
|
||||
let cache_script_bin_name_exists = std::fs::metadata(&cache_script_bin_name).is_ok();
|
||||
let cache_script_bin_name_exists = fs::metadata(&cache_script_bin_name).is_ok();
|
||||
debugging!("Bin name: {} {} exists", cache_script_bin_name, iff!(cache_script_bin_name_exists, "", "not"));
|
||||
let mut run_script_cmd = if cache_script_bin_name_exists {
|
||||
Command::new(cache_script_bin_name)
|
||||
} else {
|
||||
if let Ok(canonicalized_script_file) = PathBuf::from(script_file).canonicalize() {
|
||||
if let Some(canonicalized_script_file) = canonicalized_script_file.to_str() {
|
||||
let cache_script_bin_name_src = format!("{}.src", cache_script_bin_name);
|
||||
if let Ok(_) = fs::write(&cache_script_bin_name_src, &format!("{}\n", canonicalized_script_file)) {
|
||||
debugging!("Add {} to {}", canonicalized_script_file, cache_script_bin_name_src);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut cmd = Command::new(rust_script);
|
||||
if util_msg::is_logger_level_enabled(MessageType::DEBUG) {
|
||||
cmd.arg("--cargo-output");
|
||||
|
||||
Reference in New Issue
Block a user