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 05:10:27]

you don't need the []. Simply a "while true; do" works for you.

+  do
+    # If the last line is null
+    if [ -z `tail -1 ${OMAHA_DIR}/miniomaha.conf` ];

[Hung-Te, 2010/11/10 05:10:27]

Please use -z "$(tail -l "${OMAHA_DIR}/miniomaha.conf")".
`` should be replaced by $() as in coding style guide.

Also the "if" block should be "if [ ... ]; then".

+    then
+      sed '$d' < ${OMAHA_DIR}/miniomaha.conf > /tmp/tmp.txt
+      mv /tmp/tmp.txt ${OMAHA_DIR}/miniomaha.conf

[Hung-Te, 2010/11/10 05:10:27]

Please replace this by
sed -i '$d' "${OMAHA_DIR}/miniomaha.conf"

+    else 
+      # If the last line is some other character 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 05:10:27]

"if []; then" is better.

+        sed '$d' < ${OMAHA_DIR}/miniomaha.conf > /tmp/tmp.txt
+        mv /tmp/tmp.txt ${OMAHA_DIR}/miniomaha.conf

[Hung-Te, 2010/11/10 05:10:27]

Please replace sed+mv with "sed -i"

+      else
+        # Otherwise it is the ] we are looking for
+        sed '$d' < ${OMAHA_DIR}/miniomaha.conf > /tmp/tmp.txt
+        mv /tmp/tmp.txt ${OMAHA_DIR}/miniomaha.conf

[Hung-Te, 2010/11/10 05:10:27]

Please replace sed+mv by "sed -i"

+        break
+      fi
+    fi
+    # If the file is empty, add what we need and break
+    if [ ! -s ${OMAHA_DIR}/miniomaha.conf ];
+    then
+      echo -e "config = [" > ${OMAHA_DIR}/miniomaha.conf

[Hung-Te, 2010/11/10 05:10:27]

You don't need the "-e" since you don't have escape sequence in your parameter

+      break
+    fi 
+  done
 else
   echo -e "config = [" > ${OMAHA_DIR}/miniomaha.conf
 fi
 
 if [ -n "${FLAGS_subfolder}" ] ; then
   subfolder="${FLAGS_subfolder}/"
 fi
 
 echo -n "{
    'qual_ids': set([\"${FLAGS_board}\"]),
@@ skipping 18 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"