From f4c4779ae7d215423b7e4d56766314ae7a16f3e4 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Thu, 28 Apr 2011 10:35:02 -0500
Subject: [PATCH] enter: working revision

---
 enter | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/enter b/enter
index fa7e52e..b1e70f4 100755
--- a/enter
+++ b/enter
@@ -2,10 +2,9 @@
 # Copyright 2011 CyberLeo, All Rights Reserved
 # http://wiki.cyberleo.net/wiki/CyberLeo/COPYRIGHT
 
-meh() { printf " \033[1;32m*\033[0m %s%s\n" "${jail:+${jail}: }" "${*}"; }
-omg() { printf " \033[1;33m*\033[0m %s%s\n" "${jail:+${jail}: }" "${*}"; }
-wtf() { printf " \033[1;31m*\033[0m %s%s\n" "${jail:+${jail}: }" "${*}"; exit 1; }
-
+meh() { printf "%s\n" "${*}"; }
+omg() { printf "%s\n" "${*}"; }
+wtf() { printf "%s\n" "${*}"; exit 1; }
 pebkac() {
   [ "${*}" ] && printf "%s\n\n" "${*}"
   cat <<EOF
@@ -18,10 +17,11 @@ cmd="$(basename "${0}")"
 base="$(realpath "$(dirname "${0}")")"
 jail="$(basename "${1:-DebianChroot}")"
 jdir="${base}/${jail}"
-jail_shell=""
+
+[ -d "${jdir}" ] || wtf "${jail}: not a jail?"
 
 # Propagate certain environment variables; sterilize the rest of the environment
-jail_env="
+env="
   TERM=${TERM}
   USER=${USER}
 "
@@ -31,20 +31,6 @@ jail_new() {
   DEBOOTSTRAP_DIR="$(base)/debootstrap" "${DEBOOTSTRAP_DIR}/debootstrap" --arch=amd64 squeeze "${jdir}"
 }
 
-# Figure out jail parameters
-jail_params() {
-  # Where is the shell?
-  for shell in /bin/bash /usr/bin/bash /usr/local/bin/bash /bin/sh
-  do
-    if [ -f "${jdir}/${shell}" ]
-    then
-      jail_shell=${shell}
-      break
-    fi
-    wtf "cannot locate usable shell; is this a real jail?"
-  done
-}
-
 # Jail is 'up' if /dev/pts and /proc are mounted
 jail_up() {
   grep -q "^devpts ${jdir}/dev/pts devpts" /proc/mounts || return 1
@@ -64,7 +50,7 @@ jail_start() {
 jail_enter() {
   jail_up || wtf "jail not up"
   meh "entering ${jail} ..."
-  env -i ${env} /usr/bin/chroot "${jdir}" /bin/su "${USER}" -c "${jail_shell}" -l
+  env -i ${env} /usr/bin/chroot "${jdir}" /bin/su "${USER}" -c /bin/bash -l
 }
 
 # Unmount /dev/pts and /proc in the jail
@@ -78,8 +64,6 @@ jail_stop() {
 # Need root beyond here
 [ "$(id -u)" -eq 0 ] || exec sudo env ${env} "${0}" "${@}"
 
-jail_params
-
 case "${cmd}" in
 start) jail_start ;;
 enter) jail_enter ;;
-- 
2.45.0