crosutils: move image_common.sh to lib/cros_image_common.sh

make_factory_package.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to generate a factory install partition set and miniomaha.conf
 # file from a release image and a factory image. This creates a server
 # configuration that can be installed using a factory install shim.
 #
 # miniomaha lives in src/platform/dev/ and miniomaha partition sets live
 # in src/platform/dev/static.
 
 # 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"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 # Load functions designed for image processing
-. "$(dirname "$0")/image_common.sh"
+LIB_CROS_IMAGE_COMMON="$(dirname "$0")/lib/cros_image_common.sh"
+[ -f "$LIB_CROS_IMAGE_COMMON" ] ||

[sosa, 2010/11/12 19:42:02]

Why do you do these extra checks here for include scripts?  It seems a little
against common style in other scripts.

Can't you just simplify this to ... 

. "$(dirname "$0")/image_common.sh" || die "Missing image_common.sh"

[Hung-Te, 2010/11/12 19:56:25]

There's some plan to create a mini factory bundle having these scripts together
(i.e., not the complete checkout of scripts folder), and I'm not sure if we will
still have 'lib' folder at that time; so an additional check to find the library
script in more place.

Anyway since that's not done yet, we can postpone checking additional path until
the day we really need it. Do you think that would be better?

+  LIB_CROS_IMAGE_COMMON="$(dirname "$0")/cros_image_common.sh"
+if ! . "$LIB_CROS_IMAGE_COMMON"; then
+  echo "ERROR: Cannot load required library: $LIB_CROS_IMAGE_COMMON. Abort."
+  exit 1
+fi
 
 get_default_board
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" "Board for which the image was built"
 DEFINE_string factory "" \
   "Directory and file containing factory image: /path/chromiumos_test_image.bin"
 DEFINE_string firmware_updater "" \
   "If set, include the firmware shellball into the server configuration"
 DEFINE_string release "" \
@@ skipping 216 matching lines @@
  },
 ]
 " >> ${OMAHA_DIR}/miniomaha.conf
 
 echo "The miniomaha server lives in src/platform/dev"
 echo "to validate the configutarion, run:"
 echo "  python2.6 devserver.py --factory_config miniomaha.conf \
 --validate_factory_config"
 echo "To run the server:"
 echo "  python2.6 devserver.py --factory_config miniomaha.conf"