Add client_prefix (string) and old_prefix (bool) command line options

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
 
 # 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_string client_prefix "ChromeOSUpdateEngine" \
+  "client_prefix arg to devserver.  Old version is MementoSoftwareUpdate"
+DEFINE_boolean old_prefix ${FLAGS_FALSE} "Use old MementoSoftwareUpdate"
 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"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 set -e
@@ skipping 32 matching lines @@
 
   echo "Creating dev server in ${FLAGS_upgrade_server}:${FLAGS_dest_path}..."
 
   require_upgrade_server
   # Create new empty directory to hold server components
   ssh "${FLAGS_upgrade_server}" rm -rf "${FLAGS_dest_path}" || true
   ssh "${FLAGS_upgrade_server}" mkdir -p "${FLAGS_dest_path}/python"
 
   # Copy server components into place
   (cd ${SCRIPTS_DIR}/../.. && \
-      tar zcf - --exclude=.git --exclude=.svn \
+      tar zcfh - --exclude=.git --exclude=.svn --exclude=pkgroot \
       src/scripts/lib \
       src/scripts/start_devserver \
+      src/scripts/cros_generate_update_payload \
+      src/scripts/chromeos-common.sh \
       src/scripts/{common,get_latest_image,mk_memento_images}.sh \
       src/platform/dev) | \
       ssh ${FLAGS_upgrade_server} "cd ${FLAGS_dest_path} && tar zxf -"
 
   # Copy Python web library into place out of the chroot
   (cd ${SCRIPTS_DIR}/../../chroot/usr/lib/python*/site-packages && \
       tar zcf - web*) | \
       ssh ${FLAGS_upgrade_server} "cd ${FLAGS_dest_path}/python && tar zxf -"
 }
 
@@ skipping 41 matching lines @@
   echo "Server will be logging locally to $server_logfile"
 
   # Find a TCP listen socket that is not in use
   ssh ${FLAGS_upgrade_server} "netstat -lnt" | awk '{ print $4 }' > $portlist
   server_port=8081
   while grep -q ":${server_port}$" $portlist; do
     server_port=$[server_port + 1]
   done
   rm -f $portlist
 
-  ssh ${FLAGS_upgrade_server} "cd ${FLAGS_dest_path}/src/scripts && env PYTHONPATH=${remote_root}${FLAGS_dest_path}/python CHROMEOS_BUILD_ROOT=${archive_dir} ./start_devserver --archive_dir ${archive_dir} $server_port" > $server_logfile 2>&1 &
+  if [ "${FLAGS_old_prefix}" -eq ${FLAGS_TRUE} ] ; then
+    FLAGS_client_prefix=MementoSoftwareUpdate
+  fi
+
+  ssh ${FLAGS_upgrade_server} "cd ${FLAGS_dest_path}/src/scripts && env PYTHONPATH=${remote_root}${FLAGS_dest_path}/python CHROMEOS_BUILD_ROOT=${archive_dir} ./start_devserver --archive_dir ${archive_dir} --client_prefix ${FLAGS_client_prefix} $server_port" > $server_logfile 2>&1 &

[Sam Leffler, 2010/09/09 18:41:34]

add a comment about fixed parameter ordering

   server_pid=$!
 
   trap server_cleanup 2
 
   # Wait for server to startup
   while sleep 1; do
     if fgrep -q 'Serving images from' $server_logfile; then
       echo "Server is ready"
       break
     elif kill -0 ${server_pid}; then
@@ skipping 53 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