From 82054d957731871a3e40d2aad4522046eff7f849 Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Fri, 21 Oct 2011 08:19:49 +0000 Subject: 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 Tested-by: Sonny Rao Commit-Ready: Sonny Rao --- scripts/image_signing/common_minimal.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/image_signing/common_minimal.sh b/scripts/image_signing/common_minimal.sh index 8db19449..e5f520d4 100755 --- a/scripts/image_signing/common_minimal.sh +++ b/scripts/image_signing/common_minimal.sh @@ -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 -- cgit v1.2.1