start_devserver - Issue 6576023: scripts: call devserver/payload generators from chroot & delete moved scripts

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: start_devserver

Issue 6576023: scripts: call devserver/payload generators from chroot & delete moved scripts (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master

Patch Set: Keep bits of old start_devserver Created 9 years, 9 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

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2

3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.	2 # 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	3 # Use of this source code is governed by a BSD-style license that can be

5 # found in the LICENSE file.	4 # found in the LICENSE file.

6	5

7 # Start the Dev Server after making sure we are running under a chroot.	6 # Start the Dev Server after making sure we are running under a chroot.

8	7

9 # --- BEGIN COMMON.SH BOILERPLATE ---	8 # --- BEGIN COMMON.SH BOILERPLATE ---

10 # Load common CrOS utilities. Inside the chroot this file is installed in	9 # 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	10 # /usr/lib/crosutils. Outside the chroot we find it relative to the script's

12 # location.	11 # location.

(...skipping 12 matching lines...) Expand all Loading...
25	24

26 find_common_sh	25 find_common_sh

27 . "${SCRIPT_ROOT}/common.sh" \|\| (echo "Unable to load common.sh" && exit 1)	26 . "${SCRIPT_ROOT}/common.sh" \|\| (echo "Unable to load common.sh" && exit 1)

28 # --- END COMMON.SH BOILERPLATE ---	27 # --- END COMMON.SH BOILERPLATE ---

29	28

30 # Script must be run inside the chroot if not in 'always serve' mode.	29 # Script must be run inside the chroot if not in 'always serve' mode.

31 if [[ "$1" != "--archive_dir" ]]; then	30 if [[ "$1" != "--archive_dir" ]]; then

32 restart_in_chroot_if_needed "$@"	31 restart_in_chroot_if_needed "$@"

33 fi	32 fi

34	33

35 # Temporary workaround: to start devserver for update engine, pass in args	34 # This is the location of the script now.

36 # --client_prefix ChromeOSUpdateEngine	35 exec $(dirname ${0})/../../chroot/usr/bin/start_devserver "$@"
	sosa 2011/03/01 21:49:29 Heh ... so I realized this won't actually work for Heh ... so I realized this won't actually work for ppl who use this outside the chroot still. It seems like you'd need to put this code in the archive_dir logic and do cd ${GCLIENT_ROOT}/src/platform/dev && python devserver.py "$@" o/w
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

« no previous file with comments | « image_to_live.sh ('k') | no next file » | no next file with comments »