Index: bin/cros_workon_make |
diff --git a/bin/cros_workon_make b/bin/cros_workon_make |
index df5f0a7686b43cd132e30805989de4247e3d4adc..b4fa489a17b95b9b29973b4005e6f7f62c00f280 100755 |
--- a/bin/cros_workon_make |
+++ b/bin/cros_workon_make |
@@ -7,7 +7,26 @@ |
# Simple wrapper script to build a cros_workon package incrementally. |
# You must already be cros_workon'ing the package in question. |
-. "$(dirname $0)/../common.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 must be run inside the chroot. |
restart_in_chroot_if_needed "$@" |