diff --git a/Makefile b/Makefile
index 7d6e25de16a45d1b3d42db2165ea81d193debc2b..ca0569e6821405936d2c34d24ef9e22c52e7bd42 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-DESTDIR ?= /usr/local/bin/
+prefix ?= /usr/local
+BINARY = $(shell echo $(prefix)/bin/ion | sed 's/\/\//\//g')
all:
cargo build --release
@@ -10,9 +11,20 @@ tests:
cargo test --manifest-path members/ranges/Cargo.toml
bash examples/run_examples.sh
-install:
- strip -s target/release/ion
- install -Dm0755 target/release/ion $(DESTDIR)
+install: update-shells
+ install -Dm0755 target/release/ion $(DESTDIR)/$(BINARY)
uninstall:
- rm $(DESTDIR)/ion
+ rm $(DESTDIR)/$(BINARY)
+
+update-shells:
+ if ! grep ion /etc/shells >/dev/null; then \
+ echo $(BINARY) >> /etc/shells; \
+ else \
+ shell=$(shell grep ion /etc/shells); \
+ if [ $$shell != $(BINARY) ]; then \
+ before=$$(echo $$shell | sed 's/\//\\\//g'); \
+ after=$$(echo $(BINARY) | sed 's/\//\\\//g'); \
+ sed -i -e "s/$$before/$$after/g" /etc/shells; \
+ fi \
+ fi
diff --git a/README.md b/README.md
index ac3d16c6f83639932947f1aeaf8c8facfb43a6a2..4275a2b7a22e53e5ae2b7d7c9eaac8cb00703a84 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ cargo +nightly install --git https://gitlab.redox-os.org/redox-os/ion/
```sh
git clone https://gitlab.redox-os.org/redox-os/ion/
-cd ion && cargo +nightly build --release
+cd ion && make && sudo make install prefix=/usr
```
# Vim/NeoVim Syntax Highlighting Plugin
diff --git a/src/lib/builtins/mod.rs b/src/lib/builtins/mod.rs
index 4a6da3f7e9c4fdd561434bc1f677b880a493a592..a482b9d8d0762c47dcf1b0611ff7e97c541abac5 100644
--- a/src/lib/builtins/mod.rs
+++ b/src/lib/builtins/mod.rs
@@ -19,9 +19,7 @@ use self::{
status::status, test::test, variables::{alias, drop_alias, drop_array, drop_variable},
};
-use std::{
- env, error::Error, io::{self, Write},
-};
+use std::{error::Error, io::{self, Write}};
use parser::Terminator;
use shell::{
@@ -156,20 +154,7 @@ pub fn builtin_cd(args: &[String], shell: &mut Shell) -> i32 {
match shell.directory_stack.cd(args, &shell.variables) {
Ok(()) => {
- match env::current_dir() {
- Ok(cwd) => {
- let pwd = env::var("PWD").ok().unwrap_or_else(String::default);
- let pwd = &pwd;
- let current_dir = cwd.to_str().unwrap_or("?");
-
- if pwd != current_dir {
- env::set_var("OLDPWD", pwd);
- env::set_var("PWD", current_dir);
- }
- fork_function(shell, "CD_CHANGE", &["ion"]);
- }
- Err(_) => env::set_var("PWD", "?"),
- };
+ fork_function(shell, "CD_CHANGE", &["ion"]);
SUCCESS
}
Err(why) => {
diff --git a/src/lib/shell/directory_stack.rs b/src/lib/shell/directory_stack.rs
index dbaca704f0453606ffff8f25a3dac9faca31116e..d9564e94d2ab201e1ee1623ba9a4061f52e613ce 100644
--- a/src/lib/shell/directory_stack.rs
+++ b/src/lib/shell/directory_stack.rs
@@ -3,10 +3,25 @@ use super::{
variables::Variables,
};
use std::{
- borrow::Cow, collections::VecDeque, env::{self, current_dir, home_dir, set_current_dir},
- path::PathBuf,
+ borrow::Cow, collections::VecDeque, env::{self, home_dir, set_current_dir},
+ path::{Component, Path, PathBuf},
};
+fn set_current_dir_ion(dir: &Path) -> Result<(), Cow<'static, str>> {
+ set_current_dir(dir)
+ .map_err(|why| Cow::Owned(format!("{}", why)))?;
+
+ env::set_var(
+ "OLDPWD",
+ env::var("PWD").ok()
+ .and_then(|pwd| if pwd.is_empty() { None } else { Some(pwd) })
+ .unwrap_or_else(|| "?".into())
+ );
+
+ env::set_var("PWD", dir.to_str().unwrap_or_else(|| "?".into()));
+ Ok(())
+}
+
#[derive(Debug)]
pub struct DirectoryStack {
dirs: VecDeque<PathBuf>, // The top is always the current directory
@@ -14,7 +29,6 @@ pub struct DirectoryStack {
impl DirectoryStack {
fn normalize_path(&mut self, dir: &str) -> PathBuf {
- use std::path::{Component, Path};
// Create a clone of the current directory.
let mut new_dir = match self.dirs.front() {
Some(cur_dir) => cur_dir.clone(),
@@ -60,13 +74,12 @@ impl DirectoryStack {
) -> Result<(), Cow<'static, str>> {
let dir = self.dirs.get(index).ok_or_else(|| {
Cow::Owned(format!(
- "ion: {}: {}: directory stack out of range\n",
+ "ion: {}: {}: directory stack out of range",
caller, index
))
})?;
- set_current_dir(dir)
- .map_err(|_| Cow::Owned(format!("ion: {}: Failed setting current dir\n", caller)))
+ set_current_dir_ion(dir)
}
fn print_dirs(&self) {
@@ -170,16 +183,13 @@ impl DirectoryStack {
variables: &Variables,
) -> Result<(), Cow<'static, str>> {
let new_dir = self.normalize_path(dir);
-
- // Try to change into the new directory
- match set_current_dir(&new_dir) {
+ match set_current_dir_ion(&new_dir) {
Ok(()) => {
- // Push the new current directory onto the directory stack.
self.push_dir(new_dir, variables);
Ok(())
}
Err(err) => Err(Cow::Owned(format!(
- "ion: failed to set current dir to {}: {}\n",
+ "ion: failed to set current dir to {}: {}",
new_dir.to_string_lossy(),
err
))),
@@ -187,14 +197,9 @@ impl DirectoryStack {
}
fn get_previous_dir(&self) -> Option<String> {
- match env::var("OLDPWD") {
- Ok(previous_pwd) => if previous_pwd == "?" || previous_pwd == "" {
- None
- } else {
- Some(previous_pwd)
- },
- Err(_) => None,
- }
+ env::var("OLDPWD").ok().and_then(|pwd|
+ if pwd.is_empty() || pwd == "?" { None } else { Some(pwd) }
+ )
}
fn switch_to_previous_directory(
@@ -225,23 +230,6 @@ impl DirectoryStack {
)
}
- fn update_env_variables(&mut self) {
- // Update $OLDPWD
- if let Ok(old_pwd) = env::var("PWD") {
- if old_pwd.is_empty() {
- env::set_var("OLDPWD", "?");
- } else {
- env::set_var("OLDPWD", &old_pwd);
- }
- }
-
- // Update $PWD
- match current_dir() {
- Ok(current_dir) => env::set_var("PWD", current_dir.to_str().unwrap_or("?")),
- Err(_) => env::set_var("PWD", "?"),
- }
- }
-
pub(crate) fn cd<I: IntoIterator>(
&mut self,
args: I,
@@ -295,7 +283,7 @@ impl DirectoryStack {
None => Action::Push(PathBuf::from(arg)), // no numeric arg => `dir`-parameter
};
} else {
- return Err(Cow::Borrowed("ion: pushd: too many arguments\n"));
+ return Err(Cow::Borrowed("ion: pushd: too many arguments"));
}
}
@@ -303,7 +291,7 @@ impl DirectoryStack {
match action {
Action::Switch => {
if len < 2 {
- return Err(Cow::Borrowed("ion: pushd: no other directory\n"));
+ return Err(Cow::Borrowed("ion: pushd: no other directory"));
}
if !keep_front {
self.set_current_dir_by_index(1, "pushd")?;
@@ -326,7 +314,6 @@ impl DirectoryStack {
}
};
- self.update_env_variables();
self.print_dirs();
Ok(())
}
@@ -353,7 +340,7 @@ impl DirectoryStack {
}
None => {
return Err(Cow::Owned(format!(
- "ion: popd: {}: invalid argument\n",
+ "ion: popd: {}: invalid argument",
arg
)))
}
@@ -363,14 +350,14 @@ impl DirectoryStack {
let len: usize = self.dirs.len();
if len <= 1 {
- return Err(Cow::Borrowed("ion: popd: directory stack empty\n"));
+ return Err(Cow::Borrowed("ion: popd: directory stack empty"));
}
let mut index: usize = if count_from_front {
num
} else {
(len - 1).checked_sub(num).ok_or_else(|| {
- Cow::Owned("ion: popd: negative directory stack index out of range\n".to_owned())
+ Cow::Owned("ion: popd: negative directory stack index out of range".to_owned())
})?
};
@@ -387,12 +374,11 @@ impl DirectoryStack {
// pop element
if self.dirs.remove(index).is_none() {
return Err(Cow::Owned(format!(
- "ion: popd: {}: directory stack index out of range\n",
+ "ion: popd: {}: directory stack index out of range",
index
)));
}
- self.update_env_variables();
self.print_dirs();
Ok(())
}
@@ -413,13 +399,15 @@ impl DirectoryStack {
/// if available.
pub(crate) fn new() -> DirectoryStack {
let mut dirs: VecDeque<PathBuf> = VecDeque::new();
- match current_dir() {
+ match env::current_dir() {
Ok(curr_dir) => {
+ env::set_var("PWD", curr_dir.to_str().unwrap_or_else(|| "?"));
dirs.push_front(curr_dir);
DirectoryStack { dirs }
}
Err(_) => {
eprintln!("ion: failed to get current directory when building directory stack");
+ env::set_var("PWD", "?");
DirectoryStack { dirs }
}
}
diff --git a/src/lib/shell/variables/mod.rs b/src/lib/shell/variables/mod.rs
index f71a32141bcdc16c32655eb19b32d346b05250f9..a866562546fa432fb8ff0a39acc304899cf5203d 100644
--- a/src/lib/shell/variables/mod.rs
+++ b/src/lib/shell/variables/mod.rs
@@ -198,12 +198,6 @@ impl Default for Variables {
map.insert("HISTORY_IGNORE".into(), VariableType::Array(array!["no_such_command", "whitespace", "duplicates"]));
- // Initialize the PWD (Present Working Directory) variable
- env::current_dir().ok().map_or_else(
- || env::set_var("PWD", "?"),
- |path| env::set_var("PWD", path.to_str().unwrap_or("?")),
- );
-
// Initialize the HOME variable
env::home_dir().map_or_else(
|| env::set_var("HOME", "?"),