cros_workon: merge rm/ln commands

There's no need to execute `rm -f` directly when `ln -f` will unlink any
existing files for us.  One less command to exec.

BUG=None
TEST=`./cros_workon --board x86-alex start metrics` still works
TEST=`./cros_workon --board x86-alex stop metrics` still works

Change-Id: I784d7a215d975a11a8a4a7b5424f4e7f150bf3df
Reviewed-on: https://gerrit.chromium.org/gerrit/18176
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Mike Frysinger <vapier@chromium.org>
This commit is contained in:
Mike Frysinger 2012-03-14 18:53:08 -04:00 committed by David James
parent 904e9905ed
commit c585c5aa06

View File

@ -93,10 +93,9 @@ cmds=(
# as well as any possible future renames of WORKON_FILE.
# In particular, chroot is usually built as "amd64-host" but becomes
# just "host" after installation. crosbug.com/23096
"rm -f '${KEYWORDS_FILE}' '${MASK_FILE}' '${UNMASK_FILE}'"
"ln -s '${WORKON_FILE}' '${KEYWORDS_FILE}'"
"ln -s '${MASK_WORKON_FILE}' '${MASK_FILE}'"
"ln -s '${WORKON_FILE}' '${UNMASK_FILE}'"
"ln -sf '${WORKON_FILE}' '${KEYWORDS_FILE}'"
"ln -sf '${MASK_WORKON_FILE}' '${MASK_FILE}'"
"ln -sf '${WORKON_FILE}' '${UNMASK_FILE}'"
)
sudo_multi "${cmds[@]}"