From 48b7158ea9bee148e96e51579820afd80689003b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 27 Feb 2012 14:04:07 -0500 Subject: [PATCH] dont use -u since we already check to see if pkgs are installed --- .bin/cros-setup-chroot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.bin/cros-setup-chroot b/.bin/cros-setup-chroot index be98aaf..27d9ee4 100755 --- a/.bin/cros-setup-chroot +++ b/.bin/cros-setup-chroot @@ -1,6 +1,6 @@ #!/bin/bash set -ex -cd ~/chromiumos +cd ${1:-~/chromiumos} chr=${PWD}/chroot chome=${chr}/home/vapier sed \ @@ -15,6 +15,7 @@ cat ~/.profile.d/PS1.sh sed -e '1{/PS1=/d}' ${chr}/etc/profile.d/chromiumos-niceties.sh ) > ${chome}/.ps1.sh sudo sh -c "echo export LANG=en_US.UTF8 > ${chr}/etc/profile.d/LANG.sh" +sudo sh -c "echo FEATURES=noauto > ${chr}/etc/make.conf.user" sudo sh -c "echo -g > ${chr}/etc/ps1_append" sudo mv ${chome}/.ps1.sh ${chr}/etc/profile.d/chromiumos-niceties.sh for f in .nanorc .gdbinit .gitconfig ; do @@ -28,6 +29,6 @@ pkgs=() [[ -x ${chr}/usr/bin/tree ]] || pkgs+=( app-text/tree ) [[ -L ${chr}/usr/bin/esearch ]] || pkgs+=( esearch ) [[ -x ${chr}/usr/bin/strace ]] || pkgs+=( strace ) -[[ ${#pkgs[@]} -eq 0 ]] || cros-sdk -- sudo emerge -1u ${pkgs[@]} +[[ ${#pkgs[@]} -eq 0 ]] || cros-sdk -- sudo emerge -1 ${pkgs[@]} sudo sed -i -e '/^# inc/s:^# *::' ${chr}/etc/nanorc -- 2.39.5