Add independence to location of cros common.sh (will it move to bin/?)

bin/cros_copy_upgrade_server.sh

 #!/bin/sh
 
 # 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 push the output of build_image.sh to a remote image server
 
-# 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"
+# TODO(pstew): Apparently the script files are in transition from
+# src/scripts to src/scripts/bin.  However this state has existed
+# for months now, therefore we need to look for the common libs in
+# both places
+script_root=$(dirname $0)
+if [ -f ${script_root}/../common.sh ] ; then
+  script_root=${script_root}/..
+fi
+
+. "${script_root}/common.sh"
 
 # Flags
 DEFINE_string upgrade_server "" "SSH-capable host for upgrade server install"
 DEFINE_string dest_path "" "Directory on host to do install"
 DEFINE_string client_address "" "IP Address of netbook to update"
 DEFINE_string server_address "" "IP Address of upgrade server"
 DEFINE_boolean start_server ${FLAGS_TRUE} "Start up the server"
 DEFINE_boolean stop_server  ${FLAGS_FALSE} "Start up the server"
 DEFINE_boolean no_copy_archive  ${FLAGS_FALSE} "Skip copy of files to server"
 DEFINE_string from "" "Image directory to upload to server"
@@ skipping 176 matching lines @@
    echo "Running ${SCRIPTS_DIR}/image_to_live.sh $live_args"
     ${SCRIPTS_DIR}/image_to_live.sh $live_args &
   else
     echo "Start client upgrade using:"
     echo "    ${SCRIPTS_DIR}/image_to_live.sh ${live_args}<client_ip_address>"
   fi
 
   wait ${server_pid}
 fi