From 4bff540aad9ab6469f6fe839f023b862c438d115 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 10 Jan 2017 09:51:04 -0700
Subject: [PATCH] Correctly set environment, use SHELL in contain

---
 programs/contain/src/main.rs | 2 +-
 programs/orbutils            | 2 +-
 programs/userutils           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/programs/contain/src/main.rs b/programs/contain/src/main.rs
index 2e60062..9dde7ed 100644
--- a/programs/contain/src/main.rs
+++ b/programs/contain/src/main.rs
@@ -132,7 +132,7 @@ pub fn main() {
                 usage();
             },
             "enter" => if let Some(root) = args.next() {
-                let cmd = args.next().unwrap_or("sh".to_string());
+                let cmd = args.next().unwrap_or(env::var("SHELL").unwrap_or("sh".to_string()));
                 let args: Vec<String> = args.collect();
                 enter(Path::new(&root), &cmd, &args);
             } else {
diff --git a/programs/orbutils b/programs/orbutils
index ddd928a..cf1e1f8 160000
--- a/programs/orbutils
+++ b/programs/orbutils
@@ -1 +1 @@
-Subproject commit ddd928acecda3188a833736f28782be9b0c5205b
+Subproject commit cf1e1f8e6406e9b01a2c62e46260e82a7aa33395
diff --git a/programs/userutils b/programs/userutils
index 901caaf..ccae9c0 160000
--- a/programs/userutils
+++ b/programs/userutils
@@ -1 +1 @@
-Subproject commit 901caafce3d3d9cb9c772f4a8415e9f78a3a0da3
+Subproject commit ccae9c0b0abb9b6d2708655bdd4ef2f25be42d67