Correctly set environment, use SHELL in contain

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 {

programs/orbutils

@@ -1 +1 @@
-Subproject commit ddd928acecda3188a833736f28782be9b0c5205b
+Subproject commit cf1e1f8e6406e9b01a2c62e46260e82a7aa33395

programs/userutils

@@ -1 +1 @@
-Subproject commit 901caafce3d3d9cb9c772f4a8415e9f78a3a0da3
+Subproject commit ccae9c0b0abb9b6d2708655bdd4ef2f25be42d67