Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 | 2 |
| 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 3 # This is the location of the script now. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 exec $(dirname ${0})/../../chroot/usr/bin/start_devserver |
|
sosa
2011/03/01 21:39:18
You should keep the old code until after the if if
| |
| 5 # found in the LICENSE file. | |
| 6 | |
| 7 # Start the Dev Server after making sure we are running under a chroot. | |
| 8 | |
| 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 --- | |
| 29 | |
| 30 # Script must be run inside the chroot if not in 'always serve' mode. | |
| 31 if [[ "$1" != "--archive_dir" ]]; then | |
| 32 restart_in_chroot_if_needed "$@" | |
| 33 fi | |
|
sosa
2011/03/01 21:39:18
Do exec here.
| |
| 34 | |
| 35 # Temporary workaround: to start devserver for update engine, pass in args | |
| 36 # --client_prefix ChromeOSUpdateEngine | |
| 37 | |
| 38 # Set PKG_INSTALL_MASK if it's not set already. | |
| 39 if [ -z "${PKG_INSTALL_MASK+x}" ]; then | |
| 40 export PKG_INSTALL_MASK="${DEFAULT_INSTALL_MASK}" | |
| 41 fi | |
| 42 echo PKG_INSTALL_MASK=$PKG_INSTALL_MASK | |
| 43 | |
| 44 cd ${GCLIENT_ROOT}/src/platform/dev && python devserver.py "$@" | |
| OLD | NEW |