| OLD | NEW | 
|---|
| 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 # Run gmergefs from the scripts directory. | 7 # Run gmergefs from the scripts directory. | 
| 8 | 8 | 
| 9 COMMON_SH="$(dirname "$0")/common.sh" | 9 # --- BEGIN COMMON.SH BOILERPLATE --- | 
| 10 . "$COMMON_SH" | 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 --- | 
| 11 | 29 | 
| 12 # Script must be run inside the chroot. | 30 # Script must be run inside the chroot. | 
| 13 assert_inside_chroot | 31 assert_inside_chroot | 
| 14 | 32 | 
| 15 cd ${GCLIENT_ROOT}/src/platform/dev && ./gmergefs $* | 33 cd ${GCLIENT_ROOT}/src/platform/dev && ./gmergefs "$@" | 
| OLD | NEW | 
|---|