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

Unified Diff: set_shared_user_password.sh

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 | « run_remote_tests.sh ('k') | ssh_test.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: set_shared_user_password.sh
diff --git a/set_shared_user_password.sh b/set_shared_user_password.sh
index 25baca0e632352cce4b01469bebd2cadf2a70485..bdc7c44f1a252a37ce8d6e9bfd582a68e222a048 100755
--- a/set_shared_user_password.sh
+++ b/set_shared_user_password.sh
@@ -7,12 +7,29 @@
# Script to set the password for the shared user account. Stores the
# MD5crypt'd password to a file, for use by customize_rootfs.sh.
-# Load common constants. This should be the first executable line.
-# The path to common.sh should be relative to your script's location.
-. "$(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 $*
+restart_in_chroot_if_needed "$@"
FLAGS_HELP="USAGE: $0 [flags]"
« no previous file with comments | « run_remote_tests.sh ('k') | ssh_test.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698