From ebed18aa65295c65d2a1b474ddf587a70bcc45db Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <xavier.lheureux@icloud.com>
Date: Thu, 11 Jul 2019 13:06:05 -0400
Subject: [PATCH] improv: Use xdg for Mac OS as well
---
Cargo.lock | 62 +-------------------------------
Cargo.toml | 2 +-
src/binary/mod.rs | 47 +++++++++++++-----------
src/lib/builtins/mod.rs | 12 ++++---
src/lib/shell/directory_stack.rs | 24 +++++++------
src/lib/shell/shell_expand.rs | 31 ++++++++--------
src/lib/shell/sys/mod.rs | 11 ------
src/lib/shell/variables.rs | 8 -----
8 files changed, 64 insertions(+), 133 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 66673079..ceda9c70 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,15 +47,6 @@ dependencies = [
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "argon2rs"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "arrayvec"
version = "0.4.11"
@@ -137,15 +128,6 @@ name = "bitflags"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "blake2-rfc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "block"
version = "0.1.6"
@@ -275,11 +257,6 @@ name = "color_quant"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-[[package]]
-name = "constant_time_eq"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
[[package]]
name = "core-foundation"
version = "0.6.4"
@@ -471,26 +448,6 @@ dependencies = [
"syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "directories"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "dlib"
version = "0.4.1"
@@ -823,7 +780,6 @@ dependencies = [
"builtins-proc 0.1.0",
"calculate 0.7.0 (git+https://gitlab.redox-os.org/redox-os/calc)",
"criterion 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "directories 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"err-derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -851,6 +807,7 @@ dependencies = [
"unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1584,17 +1541,6 @@ dependencies = [
"redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[package]]
-name = "redox_users"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
[[package]]
name = "regex"
version = "1.1.9"
@@ -2146,7 +2092,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3"
-"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
"checksum auto_enums 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f812b6ee21280301290031fc5e0ff7e9566e555e8225b24d8945ae1f81d758ba"
@@ -2156,7 +2101,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5"
"checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61"
"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
-"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
"checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
"checksum bstr 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc0572e02f76cb335f309b19e0a0d585b4f62788f7d26de2a13a836a637385f"
"checksum bytecount 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4bbeb7c30341fce29f6078b4bdf876ea4779600866e98f5b2d203a534f195050"
@@ -2172,7 +2116,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
"checksum cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf79daa4e11e5def06e55306aa3601b87de6b5149671529318da048f67cdd77b"
"checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
-"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
"checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9"
@@ -2191,8 +2134,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
"checksum derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6073e9676dbebdddeabaeb63e3b7cefd23c86f5c41d381ee1237cc77b1079898"
"checksum derive_utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8051728ec2caf87b15d051687024572810187693f9d8f4ec561714d7a3fa7d9c"
-"checksum directories 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccc83e029c3cebb4c8155c644d34e3a070ccdb4ff90d369c74cd73f7cb3c984"
-"checksum dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "937756392ec77d1f2dd9dc3ac9d69867d109a2121479d72c364e42f4cab21e2d"
"checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a"
"checksum downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b92dfd5c2f75260cbf750572f95d387e7ca0ba5e3fbe9e1a33f23025be020f"
"checksum draw_state 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "33cf9537e2d06891448799b96d5a8c8083e0e90522a7fdabe6ebf4f41d79d651"
@@ -2314,7 +2255,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum read_color 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f4c8858baa4ad3c8bcc156ae91a0ffe22b76a3975c40c49b4f04c15c6bce0da"
"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
"checksum regex-automata 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ed09217220c272b29ef237a974ad58515bde75f194e3ffa7e6d0bf0f3b01f86"
"checksum regex-syntax 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9b01330cce219c1c6b2e209e5ed64ccd587ae5c67bed91c0b49eecf02ae40e21"
diff --git a/Cargo.toml b/Cargo.toml
index 2b3b34ba..523ec16a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -86,7 +86,7 @@ auto_enums = "0.5.5"
structopt = "^0.2"
atty = "0.2"
permutate = "0.3"
-directories = "2.0"
+xdg = "2.1"
nix = "0.14"
[target."cfg(all(unix, not(target_os = \"redox\")))".dependencies]
diff --git a/src/binary/mod.rs b/src/binary/mod.rs
index 282b903b..64b256e4 100644
--- a/src/binary/mod.rs
+++ b/src/binary/mod.rs
@@ -7,7 +7,6 @@ mod lexer;
mod prompt;
mod readln;
-use directories::ProjectDirs;
use ion_shell::{
builtins::{man_pages, BuiltinFunction, Status},
expansion::Expander,
@@ -24,6 +23,7 @@ use std::{
path::Path,
rc::Rc,
};
+use xdg::BaseDirectories;
#[cfg(not(feature = "advanced_arg_parsing"))]
pub const MAN_ION: &str = r#"Ion - The Ion Shell 1.0.0-alpha
@@ -123,10 +123,8 @@ impl<'a> InteractiveShell<'a> {
})));
}
- fn create_config_file(path: &Path) -> Result<(), io::Error> {
- if let Some(parent) = path.parent() {
- fs::create_dir_all(parent)?;
- }
+ fn create_config_file(base_dirs: &BaseDirectories) -> Result<(), io::Error> {
+ let path = base_dirs.place_config_file(Self::CONFIG_FILE_NAME)?;
OpenOptions::new().write(true).create_new(true).open(path).map(|_| ())
}
@@ -233,22 +231,19 @@ impl<'a> InteractiveShell<'a> {
.add("exec", exec, "Replace the shell with the given command.")
.add("huponexit", set_huponexit, "Hangup the shell's background jobs on exit");
- match ProjectDirs::from("org", "Redox OS", "ion") {
- Some(project_dir) => {
+ match BaseDirectories::with_prefix("ion") {
+ Ok(project_dir) => {
Self::exec_init_file(&project_dir, &mut shell);
Self::load_history(&project_dir, &mut shell, &mut context.borrow_mut());
}
- None => eprintln!("ion: unable to get base directory"),
+ Err(err) => eprintln!("ion: unable to get xdg base directory: {}", err),
}
InteractiveShell { context, shell: RefCell::new(shell), terminated, huponexit }
.exec(prep_for_exit)
}
- fn load_history(project_dir: &ProjectDirs, shell: &mut Shell, context: &mut Context) {
- // Initialize the HISTFILE variable
- let path = project_dir.data_dir().join("history");
- shell.variables_mut().set("HISTFILE", path.to_string_lossy().as_ref());
+ fn load_history(project_dir: &BaseDirectories, shell: &mut Shell, context: &mut Context) {
shell.variables_mut().set("HISTFILE_ENABLED", "1");
// History Timestamps enabled variable, disabled by default
@@ -256,22 +251,32 @@ impl<'a> InteractiveShell<'a> {
shell
.variables_mut()
.set("HISTORY_IGNORE", array!["no_such_command", "whitespace", "duplicates"]);
- if !path.exists() {
- eprintln!("ion: creating history file at \"{}\"", path.display());
+ // Initialize the HISTFILE variable
+ if let Some(histfile) = project_dir.find_data_file("history") {
+ shell.variables_mut().set("HISTFILE", histfile.to_string_lossy().as_ref());
+ let _ = context.history.set_file_name_and_load_history(&histfile);
+ } else {
+ match project_dir.place_data_file("history") {
+ Ok(histfile) => {
+ eprintln!("ion: creating history file at \"{}\"", histfile.display());
+ shell.variables_mut().set("HISTFILE", histfile.to_string_lossy().as_ref());
+ let _ = context.history.set_file_name_and_load_history(&histfile);
+ }
+ Err(err) => println!("ion: could not create history file: {}", err),
+ }
}
- let _ = context.history.set_file_name_and_load_history(&path);
}
- fn exec_init_file(project_dir: &ProjectDirs, shell: &mut Shell) {
- let initrc = project_dir.config_dir().join(Self::CONFIG_FILE_NAME);
- match fs::File::open(&initrc) {
- Ok(script) => {
+ fn exec_init_file(project_dir: &BaseDirectories, shell: &mut Shell) {
+ let initrc = project_dir.find_config_file(Self::CONFIG_FILE_NAME);
+ match initrc.and_then(|initrc| fs::File::open(&initrc).ok()) {
+ Some(script) => {
if let Err(err) = shell.execute_command(std::io::BufReader::new(script)) {
eprintln!("ion: could not exec initrc: {}", err);
}
}
- Err(_) => {
- if let Err(err) = Self::create_config_file(&initrc) {
+ None => {
+ if let Err(err) = Self::create_config_file(project_dir) {
eprintln!("ion: could not create config file: {}", err);
}
}
diff --git a/src/lib/builtins/mod.rs b/src/lib/builtins/mod.rs
index 8ef3658c..e76fbd31 100644
--- a/src/lib/builtins/mod.rs
+++ b/src/lib/builtins/mod.rs
@@ -45,7 +45,7 @@ use liner::{Completer, Context};
use std::{
borrow::Cow,
io::{self, BufRead},
- path::PathBuf,
+ path::{Path, PathBuf},
};
const HELP_DESC: &str = "Display helpful information about a given command or list commands if \
@@ -283,7 +283,7 @@ DESCRIPTION
pub fn cd(args: &[types::Str], shell: &mut Shell<'_>) -> Status {
let err = match args.get(1) {
Some(dir) => {
- let dir = dir.as_ref();
+ let dir = dir.as_str();
if let Some(Value::Array(cdpath)) = shell.variables().get("CDPATH").cloned() {
if dir == "-" {
shell.dir_stack_mut().switch_to_previous_directory()
@@ -291,16 +291,18 @@ pub fn cd(args: &[types::Str], shell: &mut Shell<'_>) -> Status {
let check_cdpath_first = cdpath
.iter()
.map(|path| {
- let path_dir = format!("{}/{}", path, dir);
+ let path_dir = Path::new(&path.to_string()).join(dir);
shell.dir_stack_mut().change_and_push_dir(&path_dir)
})
.find(Result::is_ok)
- .unwrap_or_else(|| shell.dir_stack_mut().change_and_push_dir(dir));
+ .unwrap_or_else(|| {
+ shell.dir_stack_mut().change_and_push_dir(&Path::new(dir))
+ });
shell.dir_stack_mut().popd(1);
check_cdpath_first
}
} else {
- shell.dir_stack_mut().change_and_push_dir(dir)
+ shell.dir_stack_mut().change_and_push_dir(&Path::new(dir))
}
}
None => shell.dir_stack_mut().switch_to_home_directory(),
diff --git a/src/lib/shell/directory_stack.rs b/src/lib/shell/directory_stack.rs
index 6dbd8a58..7dc10164 100644
--- a/src/lib/shell/directory_stack.rs
+++ b/src/lib/shell/directory_stack.rs
@@ -1,4 +1,3 @@
-use directories::BaseDirs;
use err_derive::Error;
use std::{
collections::VecDeque,
@@ -6,6 +5,7 @@ use std::{
io,
path::{Component, Path, PathBuf},
};
+use users::os::unix::UserExt;
#[derive(Debug, Error)]
pub enum DirStackError {
@@ -52,7 +52,7 @@ impl Default for DirectoryStack {
}
impl DirectoryStack {
- fn normalize_path(&mut self, dir: &str) -> PathBuf {
+ fn normalize_path(&mut self, dir: &Path) -> PathBuf {
// Create a clone of the current directory.
let mut new_dir = match self.dirs.front() {
Some(cur_dir) => cur_dir.clone(),
@@ -61,7 +61,7 @@ impl DirectoryStack {
// Iterate through components of the specified directory
// and calculate the new path based on them.
- for component in Path::new(dir).components() {
+ for component in dir.components() {
match component {
Component::CurDir => {}
Component::ParentDir => {
@@ -127,7 +127,7 @@ impl DirectoryStack {
}
}
- pub fn change_and_push_dir(&mut self, dir: &str) -> Result<(), DirStackError> {
+ pub fn change_and_push_dir(&mut self, dir: &Path) -> Result<(), DirStackError> {
let new_dir = self.normalize_path(dir);
set_current_dir_ion(&new_dir)?;
self.push_dir(new_dir);
@@ -143,15 +143,17 @@ impl DirectoryStack {
self.dirs.remove(0);
println!("{}", prev);
- self.change_and_push_dir(&prev)
+ self.change_and_push_dir(&Path::new(&prev))
}
pub fn switch_to_home_directory(&mut self) -> Result<(), DirStackError> {
- BaseDirs::new().map_or(Err(DirStackError::FailedFetchHome), |base_dir| {
- base_dir.home_dir().to_str().map_or(Err(DirStackError::PathConversionFailed), |home| {
- self.change_and_push_dir(home)
- })
- })
+ match env::var_os("HOME") {
+ Some(home) => self.change_and_push_dir(Path::new(&home)),
+ None => users::get_user_by_uid(users::get_current_uid())
+ .map_or(Err(DirStackError::FailedFetchHome), |user| {
+ self.change_and_push_dir(user.home_dir())
+ }),
+ }
}
pub fn swap(&mut self, index: usize) -> Result<(), DirStackError> {
@@ -164,7 +166,7 @@ impl DirectoryStack {
pub fn pushd(&mut self, path: &Path, keep_front: bool) -> Result<(), DirStackError> {
let index = if keep_front { 1 } else { 0 };
- let new_dir = self.normalize_path(path.to_str().unwrap());
+ let new_dir = self.normalize_path(path);
self.insert_dir(index, new_dir);
self.set_current_dir_by_index(index)
}
diff --git a/src/lib/shell/shell_expand.rs b/src/lib/shell/shell_expand.rs
index c3a19c35..52e21b16 100644
--- a/src/lib/shell/shell_expand.rs
+++ b/src/lib/shell/shell_expand.rs
@@ -1,16 +1,13 @@
use super::{
- pipe_exec::create_pipe,
- sys::{variables, NULL_PATH},
- variables::Value,
- IonError, PipelineError, Shell,
+ pipe_exec::create_pipe, sys::NULL_PATH, variables::Value, IonError, PipelineError, Shell,
};
use crate::{
expansion::{Error, Expander, Result, Select},
types,
};
-use directories::BaseDirs;
use nix::unistd::{tcsetpgrp, Pid};
use std::{env, fs::File, io::Read, iter::FromIterator};
+use users::os::unix::UserExt;
impl<'a, 'b> Expander for Shell<'b> {
type Error = IonError;
@@ -211,13 +208,8 @@ impl<'a, 'b> Expander for Shell<'b> {
let (tilde_prefix, rest) = input[1..].split_at(separator.unwrap_or(input.len() - 1));
match tilde_prefix {
- "" => BaseDirs::new()
- .map(|base_dirs| {
- types::Str::from(base_dirs.home_dir().to_string_lossy().as_ref()) + rest
- })
- .ok_or(Error::HomeNotFound),
- "+" => Ok((env::var("PWD").unwrap_or_else(|_| "?".to_string()) + rest).into()),
- "-" => Ok((self.variables.get_str("OLDPWD")?.to_string() + rest).into()),
+ "+" => Ok(env::var("PWD").unwrap_or_else(|_| "?".into()).into()),
+ "-" => Ok(self.variables.get_str("OLDPWD")?.into()),
_ => {
let (neg, tilde_num) = if tilde_prefix.starts_with('+') {
(false, &tilde_prefix[1..])
@@ -235,11 +227,20 @@ impl<'a, 'b> Expander for Shell<'b> {
}
.map(|path| path.to_str().unwrap().into())
.ok_or_else(|| Error::OutOfStack(num)),
- Err(_) => variables::get_user_home(tilde_prefix)
- .map(|home| (home + rest).into())
- .ok_or(Error::HomeNotFound),
+ Err(_) => {
+ let user = if tilde_prefix.is_empty() {
+ users::get_user_by_uid(users::get_current_uid())
+ } else {
+ users::get_user_by_name(tilde_prefix)
+ };
+ match user {
+ Some(user) => Ok(user.home_dir().to_string_lossy().as_ref().into()),
+ None => Err(Error::HomeNotFound),
+ }
+ }
}
}
}
+ .map(|home: types::Str| home + rest)
}
}
diff --git a/src/lib/shell/sys/mod.rs b/src/lib/shell/sys/mod.rs
index 082b1a87..74aa9d58 100644
--- a/src/lib/shell/sys/mod.rs
+++ b/src/lib/shell/sys/mod.rs
@@ -4,14 +4,3 @@ pub mod signals;
pub const NULL_PATH: &str = "null:";
#[cfg(unix)]
pub const NULL_PATH: &str = "/dev/null";
-
-pub mod variables {
- use users::{get_user_by_name, os::unix::UserExt};
-
- pub fn get_user_home(username: &str) -> Option<String> {
- match get_user_by_name(username) {
- Some(user) => Some(user.home_dir().to_string_lossy().into_owned()),
- None => None,
- }
- }
-}
diff --git a/src/lib/shell/variables.rs b/src/lib/shell/variables.rs
index 88061a72..9f65a419 100644
--- a/src/lib/shell/variables.rs
+++ b/src/lib/shell/variables.rs
@@ -4,7 +4,6 @@ use crate::{
shell::IonError,
types::{self, Array},
};
-use directories::BaseDirs;
use nix::unistd::{geteuid, gethostname, getpid, getuid};
use scopes::{Namespace, Scope, Scopes};
use std::{env, rc::Rc};
@@ -251,13 +250,6 @@ impl<'a> Default for Variables<'a> {
map.set("CDPATH", Array::new());
- // Initialize the HOME variable
- if let Some(base_dirs) = BaseDirs::new() {
- env::set_var("HOME", base_dirs.home_dir().to_string_lossy().as_ref());
- } else {
- env::set_var("HOME", "?");
- }
-
// Initialize the HOST variable
let mut host_name = [0_u8; 512];
env::set_var(
--
GitLab