Fix common.sh to work in it's new location at /usr/lib/crosutils.

Fix common.sh to work in it's new location at /usr/lib/crosutils.

If we are inside the chroot then we assume that the "gclient" root
is ~/trunk.  If we are outside the chroot we continue with the
previous search mechanism to find the "gclient" root.

Change-Id: Ia40de609ea596228fec2644ff3046e376b112b06

BUG=chromium-os:4230
TEST=run "src/scripts/cros_overlay_list --board tegra2 --variant seaboard" inside and outside the chroot, and under sudo.

Review URL: http://codereview.chromium.org/6265028

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=30acb0b

[robotboy, 2011-01-26 21:08:19]

This version looks to see if SUDO_USER exists and uses that to construct the
home directory, if it doesn't exist it uses USER.  This version has been tested
inside and outside the chroot, and within a sudo context.

[davidjames, 2011-01-26 21:26:14]

http://codereview.chromium.org/6344016/diff/1/common.sh
File common.sh (right):

http://codereview.chromium.org/6344016/diff/1/common.sh#newcode37
common.sh:37: GCLIENT_ROOT="/home/${SUDO_USER:-$USER}/trunk"
Hmm, so this doesn't work for me.

./enter_chroot.sh -- sh -c 'echo $SUDO_USER' reports root, whereas
./enter_chroot.sh -- sh -c 'echo $USER' reports davidjames.

Here's the output I get for cros_overlay_list with your patch:

$ ./bin/cros_overlay_list --board tegra2 --variant seaboard
ERROR  : There is no variant overlay called 'seaboard'

[sosa, 2011-01-26 22:16:19]

This patch works for the case that broke the tree for me i.e.

./enter_chroot.sh -- sudo ./start_devserver.

On Wed, Jan 26, 2011 at 1:26 PM,  <davidjames@chromium.org> wrote:
>
> http://codereview.chromium.org/6344016/diff/1/common.sh
> File common.sh (right):
>
> http://codereview.chromium.org/6344016/diff/1/common.sh#newcode37
> common.sh:37: GCLIENT_ROOT="/home/${SUDO_USER:-$USER}/trunk"
> Hmm, so this doesn't work for me.
>
> ./enter_chroot.sh -- sh -c 'echo $SUDO_USER' reports root, whereas
> ./enter_chroot.sh -- sh -c 'echo $USER' reports davidjames.
>
> Here's the output I get for cros_overlay_list with your patch:
>
> $ ./bin/cros_overlay_list --board tegra2 --variant seaboard
> ERROR  : There is no variant overlay called 'seaboard'
>
> http://codereview.chromium.org/6344016/
>

[robotboy, 2011-01-26 22:56:08]

OK, one more time.  :)  This version works in all known configurations (known to
me at least).  The dev server works.  Cros overlay list works both inside and
outside, both with and without sudo.

PTAL.

[davidjames, 2011-01-26 23:41:33]

LGTM w/nits

http://codereview.chromium.org/6344016/diff/6001/common.sh
File common.sh (right):

http://codereview.chromium.org/6344016/diff/6001/common.sh#newcode32
common.sh:32: if [ $INSIDE_CHROOT -eq 1 ]; then echo "/home/${USER}/trunk"
Since this isn't a one-line if statement, better to put a newline between 'then'
and 'echo'.

http://codereview.chromium.org/6344016/diff/6001/common.sh#newcode33
common.sh:33: if [ ! -z "${SUDO_USER}" ]; then echo "/home/${SUDO_USER}/trunk";
fi
Any reason why you didn't use -n here (and elsewhere) instead of -z?

[robotboy, 2011-01-26 23:59:34]

Thanks.

http://codereview.chromium.org/6344016/diff/6001/common.sh
File common.sh (right):

http://codereview.chromium.org/6344016/diff/6001/common.sh#newcode32
common.sh:32: if [ $INSIDE_CHROOT -eq 1 ]; then echo "/home/${USER}/trunk"
On 2011/01/26 23:41:33, davidjames wrote:
> Since this isn't a one-line if statement, better to put a newline between
'then'
> and 'echo'.

Done.

http://codereview.chromium.org/6344016/diff/6001/common.sh#newcode33
common.sh:33: if [ ! -z "${SUDO_USER}" ]; then echo "/home/${SUDO_USER}/trunk";
fi
On 2011/01/26 23:41:33, davidjames wrote:
> Any reason why you didn't use -n here (and elsewhere) instead of -z?

Done.