holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dot character is valid in Windows plugin binaries.

Browse Source
This commit is contained in:
Andrés N. Robalino 2019-09-12 02:11:38 -05:00
parent c57c0eb371
commit e4ed8c94ad
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cli.rs
View File

@ -138,15 +138,7 @@ fn load_plugins(context: &mut Context) -> Result<(), ShellError> {
for path in search_paths() {
let mut pattern = path.to_path_buf();
#[cfg(windows)]
{
pattern.push(std::path::Path::new("nu_plugin_[a-z]*.[a-z]*"));
}
#[cfg(not(windows))]
{
pattern.push(std::path::Path::new("nu_plugin_[a-z]*"));
}
pattern.push(std::path::Path::new("nu_plugin_[a-z]*"));
match glob::glob_with(&pattern.to_string_lossy(), opts) {
Err(_) => {}
@ -167,15 +159,26 @@ fn load_plugins(context: &mut Context) -> Result<(), ShellError> {
}
};
let is_valid_name = bin_name
.chars()
.all(|c| c.is_ascii_alphabetic() || c == '_');
let is_valid_name = {
#[cfg(windows)]
{
bin_name
.chars()
.all(|c| c.is_ascii_alphabetic() || c == '_' || c == '.')
}
#[cfg(not(windows))]
{
bin_name
.chars()
.all(|c| c.is_ascii_alphabetic() || c == '_')
}
};
let is_executable = {
#[cfg(windows)]
{
bin.ends_with(std::path::Path::new(".exe"))
|| bin.ends_with(std::path::Path::new(".bat"))
bin_name.ends_with(".exe") || bin_name.ends_with(".bat")
}
#[cfg(not(windows))]