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

Side by Side Diff: start_devserver

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, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ssh_test.sh ('k') | sync_build_test.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 2
3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Start the Dev Server after making sure we are running under a chroot. 7 # Start the Dev Server after making sure we are running under a chroot.
8 8
9 . "$(dirname "$0")/common.sh" 9 # --- BEGIN COMMON.SH BOILERPLATE ---
10 # Load common CrOS utilities. Inside the chroot this file is installed in
11 # /usr/lib/crosutils. Outside the chroot we find it relative to the script's
12 # location.
13 find_common_sh() {
14 local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")"))
15 local path
16
17 SCRIPT_ROOT=
18 for path in "${common_paths[@]}"; do
19 if [ -r "${path}/common.sh" ]; then
20 SCRIPT_ROOT=${path}
21 break
22 fi
23 done
24 }
25
26 find_common_sh
27 . "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
28 # --- END COMMON.SH BOILERPLATE ---
10 29
11 # Script must be run inside the chroot if not in 'always serve' mode. 30 # Script must be run inside the chroot if not in 'always serve' mode.
12 if [[ "$1" != "--archive_dir" ]] 31 if [[ "$1" != "--archive_dir" ]]; then
13 then 32 restart_in_chroot_if_needed "$@"
14 restart_in_chroot_if_needed $*
15 fi 33 fi
16 34
17 # Temporary workaround: to start devserver for update engine, pass in args 35 # Temporary workaround: to start devserver for update engine, pass in args
18 # --client_prefix ChromeOSUpdateEngine 36 # --client_prefix ChromeOSUpdateEngine
19 37
20 # Set PKG_INSTALL_MASK if it's not set already. 38 # Set PKG_INSTALL_MASK if it's not set already.
21 if [ -z "${PKG_INSTALL_MASK+x}" ]; then 39 if [ -z "${PKG_INSTALL_MASK+x}" ]; then
22 export PKG_INSTALL_MASK="${DEFAULT_INSTALL_MASK}" 40 export PKG_INSTALL_MASK="${DEFAULT_INSTALL_MASK}"
23 fi 41 fi
24 echo PKG_INSTALL_MASK=$PKG_INSTALL_MASK 42 echo PKG_INSTALL_MASK=$PKG_INSTALL_MASK
25 43
26 cd ${GCLIENT_ROOT}/src/platform/dev && python devserver.py $* 44 cd ${GCLIENT_ROOT}/src/platform/dev && python devserver.py "$@"
OLDNEW
« no previous file with comments | « ssh_test.sh ('k') | sync_build_test.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698