Make removing the last ] more full-proof

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.
 #
@@ skipping 148 matching lines @@
   firmware_hash=`cat firmware.gz | openssl sha1 -binary | openssl base64`
   mv firmware.gz ${OMAHA_DATA_DIR}
   echo "firmware: ${firmware_hash}"
 fi
 
 # If the file does exist and we are using the subfolder flag we are going to
 # append another config.
 if [ -n "${FLAGS_subfolder}" ] && \
    [ -f "${OMAHA_DIR}"/miniomaha.conf"" ] ; then
   # Remove the ']' from the last line of the file so we can add another config.
-  sed -i '$d' ${OMAHA_DIR}/miniomaha.conf
+  while true

[Hung-Te, 2010/11/10 08:41:10]

If the checking condition is always true here, I think an empty file will fall
into endless loop by the check if [ -z "..." ].

Would you mind to check and verify that?

A "while [ -s "${OMAHA_DIR}/miniomaha.conf" ]; do " may be better

+  do
+    # If the last line is null
+    if [ -z "$(tail -1 "${OMAHA_DIR}/miniomaha.conf")" ]; then
+      sed -i '$d' ${OMAHA_DIR}/miniomaha.conf 

[Hung-Te, 2010/11/10 08:41:10]

Please quote the file as "${OMAHA_DIR}/miniomana.conf" when you want to use
${OMAHA_DIR}, because you don't know if people will get a space in the folder
name OMAHA_DIR.

This also applies to all reference to ${OMAHA_DIR}/miniomaha.conf below.

+    else 

[Hung-Te, 2010/11/10 08:41:10]

This else can be merged with next if as "elif", which makes the logic more
clear.

+      # If the last line is some other string that is not ] then it is
+      # garbage and we don't need it
+      if [ `tail -1 ${OMAHA_DIR}/miniomaha.conf` != ']' ]; then

[Hung-Te, 2010/11/10 08:41:10]

Please change `tail ... conf` with $(tail ..."${OMAHA....conf")

+        sed -i '$d' ${OMAHA_DIR}/miniomaha.conf
+      else
+        break
+      fi
+    fi
+  done
+
+  # Remove the last ]
+  if [ `tail -1 ${OMAHA_DIR}/miniomaha.conf` == ']' ]; then

[Hung-Te, 2010/11/10 08:41:10]

== is bash special syntax and not POSIX compatible. Please use '=' instead.

Also please use $(tail ...) instead of `tail ... conf`

+    sed -i '$d' ${OMAHA_DIR}/miniomaha.conf
+  fi
+
+  # If the file is empty, create it from scratch
+  if [ ! -s ${OMAHA_DIR}/miniomaha.conf ]; then
+    echo "config = [" > ${OMAHA_DIR}/miniomaha.conf
+  fi
 else
-  echo -e "config = [" > ${OMAHA_DIR}/miniomaha.conf
+  echo "config = [" > ${OMAHA_DIR}/miniomaha.conf
 fi
 
 if [ -n "${FLAGS_subfolder}" ] ; then
   subfolder="${FLAGS_subfolder}/"
 fi
 
 echo -n "{
    'qual_ids': set([\"${FLAGS_board}\"]),
    'factory_image': '"${subfolder}"rootfs-test.gz',
    'factory_checksum': '${test_hash}',
@@ skipping 16 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"