git-rewrite-authors: silence rewrite warning+delay

[home.git] / .bin / cros-setup-chroot

diff --git a/.bin/cros-setup-chroot b/.bin/cros-setup-chroot
index 0b34ba2a511d240b7dff23a00b1c262a923f770f..0fc872b5a4e7e786a9d712fbffcfdc4f60d3fd4a 100755 (executable)
--- a/.bin/cros-setup-chroot
+++ b/.bin/cros-setup-chroot
@@ -8,6 +8,7 @@ sed \
        -e '/^set speller/s:^:#:' \
        -e '/^unbind/s:^:#:' \
        ~/.nanorc > ${chome}/.nanorc
+cp ~/.inputrc ${chome}/
 cp ~/.gdbinit ${chome}/
 (
 cat ~/.profile.d/aliases.sh
@@ -17,12 +18,14 @@ echo "export USE='-cros-debug'"
 sudo mkdir -p ${chr}/etc/profile.d ${chr}/etc/portage/package.{mask,unmask,use,keywords}
 (
 cat ~/.profile.d/PS1.sh
-sed -e '1{/PS1=/d}' ${chr}/etc/profile.d/chromiumos-niceties.sh
+sed -e '1{/PS1=/d}' ${chr}/etc/profile.d/chromiumos-niceties.sh 2>/dev/null || \
+       echo 'PS1="(cr) ${PS1}"'
 ) > ${chome}/.ps1.sh
 sudo sh -c 'echo export LANG=en_US.UTF8 > '"${chr}/etc/profile.d/LANG.sh"
+sudo sh -c 'echo PATH+=:/sbin:/usr/sbin:/usr/local/sbin > '"${chr}/etc/profile.d/sbin.sh"
 sudo sh -c "cat > '${chr}/etc/make.conf.user'" <<-\EOF
        FEATURES="${FEATURES} noauto"
-       EMERGE_DEFAULT_OPTS="--color y"
+       EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --color y"
        ACCEPT_LICENSE="${ACCEPT_LICENSE} Google-TOS"
 EOF
 sudo sh -c 'echo -g > '"${chr}/etc/ps1_append"
@@ -38,7 +41,7 @@ pkgs=()
 [[ -x ${chr}/usr/bin/tree ]] || pkgs+=( app-text/tree )
 [[ -L ${chr}/usr/bin/esearch ]] || pkgs+=( esearch )
 [[ -x ${chr}/usr/bin/strace ]] || pkgs+=( strace )
-[[ -x ${chr}/usr/bin/time ]] || pkgs+=( time )
+[[ -x ${chr}/usr/bin/time ]] || pkgs+=( sys-process/time )
 [[ -x ${chr}/usr/bin/gdb ]] || pkgs+=( sys-devel/gdb )
 [[ -x ${chr}/usr/bin/diffstat ]] || pkgs+=( diffstat )
 [[ ${#pkgs[@]} -eq 0 ]] || cros_sdk -- sudo emerge -1q --jobs ${ncpus} ${pkgs[@]}