Change load_shflags to use the new location of shflags for clients

BUG=chromium-os:21742
TEST=manual, ensure vboot scripts continue to work
like make_dev_ssd.sh on the client

Change-Id: I405334bab734f35a1a81e4b9e90e93cb760cc3d2
Reviewed-on: https://gerrit.chromium.org/gerrit/10479
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: Sonny Rao <sonnyrao@chromium.org>
This commit is contained in:
Sonny Rao
2011-10-21 08:19:49 +00:00
committed by Gerrit
parent 7f253ebc03
commit 82054d9577

View File

@@ -4,8 +4,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# Note: This file must be written in dash compatible way as scripts that use
# this may run in the Chrome OS client enviornment.
# Note: This file must be written in dash compatible way as scripts that use
# this may run in the Chrome OS client enviornment.
# Determine script directory
SCRIPT_DIR=$(dirname $0)
@@ -22,10 +22,8 @@ TEMP_DIR_LIST=$(mktemp)
# Finds and loads the 'shflags' library, or return as failed.
load_shflags() {
# Load shflags
if [ -f /usr/lib/shflags ]; then
. /usr/lib/shflags
elif [ -f "${SCRIPT_DIR}/shflags" ]; then
. "${SCRIPT_DIR}/shflags"
if [ -f /usr/share/misc/shflags ]; then
. /usr/share/misc/shflags
elif [ -f "${SCRIPT_DIR}/lib/shflags/shflags" ]; then
. "${SCRIPT_DIR}/lib/shflags/shflags"
else