Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: gmergefs

Issue 6240018: This starts to fix the scripts so that they load from /usr/lib/crosutils (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: fixing bad merge Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « get_package_list ('k') | image_hacks.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gmergefs
diff --git a/gmergefs b/gmergefs
index 6995a6fd0894aac2bf0c271549ef06cb0fe37675..2be45dad2d58427b380f8742c39f81496033b013 100755
--- a/gmergefs
+++ b/gmergefs
@@ -6,10 +6,28 @@
# Run gmergefs from the scripts directory.
-COMMON_SH="$(dirname "$0")/common.sh"
-. "$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.
assert_inside_chroot
-cd ${GCLIENT_ROOT}/src/platform/dev && ./gmergefs $*
+cd ${GCLIENT_ROOT}/src/platform/dev && ./gmergefs "$@"
« no previous file with comments | « get_package_list ('k') | image_hacks.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698