From c585c5aa06ccaca1511c7fed490fbb24a2bc1ae3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 14 Mar 2012 18:53:08 -0400 Subject: [PATCH] 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 Tested-by: Mike Frysinger Commit-Ready: Mike Frysinger --- cros_workon | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cros_workon b/cros_workon index 3f3e35627b..f61d0af02e 100755 --- a/cros_workon +++ b/cros_workon @@ -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[@]}"