Index: bin/cros_get_chrome_version |
diff --git a/bin/cros_get_chrome_version b/bin/cros_get_chrome_version |
index a29cb3275f5602ca05f72c0e80e9833c97127d77..938b57a6818956f5a644dc1d02e262c3e88424ce 100755 |
--- a/bin/cros_get_chrome_version |
+++ b/bin/cros_get_chrome_version |
@@ -6,8 +6,28 @@ |
# Returns the version of Chrome running on a remote machine. |
-. "$(dirname $0)/../common.sh" |
-. "$(dirname $0)/../remote_access.sh" |
+# --- BEGIN COMMON.SH BOILERPLATE --- |
+# Load common CrOS utilities. Inside the chroot this file is installed in |
+# /usr/lib/crosutils. Outside the chroot we find it relative to the script's |
+# location. |
+find_common_sh() { |
+ local common_paths=(/usr/lib/crosutils "$(dirname "$(readlink -f "$0")")/..") |
+ local path |
+ |
+ SCRIPT_ROOT= |
+ for path in "${common_paths[@]}"; do |
+ if [ -r "${path}/common.sh" ]; then |
+ SCRIPT_ROOT=${path} |
+ break |
+ fi |
+ done |
+} |
+ |
+find_common_sh |
+. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) |
+# --- END COMMON.SH BOILERPLATE --- |
+ |
+. "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh" |
FLAGS "$@" || exit 1 |