Split common.sh into bash-only and dash-only sections

scripts/image_signing/resign_firmwarefd.sh

-#!/bin/bash
+#!/bin/sh
 
 # Copyright (c) 2010 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 resign a firmware image using a different set of keys
 # for use on signing servers.
 #
 # arguments: src_fd, dst_fd, firmware_datakey, and firmware_keyblock
 #
@@ skipping 29 matching lines @@
 #  area_flags_raw="0x03" area_flags="static,compressed"
 # area_offset="0x00005200" area_size="0x00001000" area_name="RW VPD" \
 #  area_flags_raw="0x00" area_flags=""
 #
 # This shows that Firmware A Data is at offset 0x0000a0000 in the .fd image
 # and is of size 0x0009e000 bytes. This can be extracted to generate new vblocks
 # which can then replace old vblock for Firmware A ("Firmware A Key" region at
 # offset 0x00008000 and size 0x00002000).
 
 # Load common constants and variables.
-. "$(dirname "$0")/common.sh"
+. "$(dirname "$0")/common_minimal.sh"
 
 # Abort on error
 set -e
 
 # Check arguments
 if [ $# -ne 5 ] ; then
   echo \
     "Usage: $0 src_fd dst_fd firmware_datakey firmware_keyblock kernel_subkey"
   exit 1
 fi
 
 # Make sure the tools we need are available.
 for prog in mosys vbutil_firmware; do
-  type -P "${prog}" &>/dev/null || \
+  type "${prog}" &>/dev/null || \
     { echo "${prog} tool not found."; exit 1; }
 done
 
 src_fd=$1
 dst_fd=$2
 firmware_datakey=$3
 firmware_keyblock=$4
 kernel_subkey=$5
 
 # TODO(gauravsh): Figure out where the version comes from.
 #                 Do we rev it manually?
 VERSION=1
 
 # Parse offsets and size of firmware data and vblocks
 for i in "A" "B"
 do
   match_str="$i Key"
   line=$(mosys -f -k eeprom map $1 | grep "$match_str")
   offset="$(echo $line | sed -e 's/.*area_offset=\"\([a-f0-9x]*\)\".*/\1/')"
-  eval let \
-    fw${i}_vblock_offset="$offset"
+  eval fw${i}_vblock_offset=$((offset))
   size="$(echo $line | sed -e 's/.*area_size=\"\([a-f0-9x]*\)\".*/\1/')"
-  eval let \
-    fw${i}_vblock_size="$size"
+  eval fw${i}_vblock_size=$((size))
 
   match_str="$i Data"
   line=$(mosys -f -k eeprom map $1 | grep "$match_str")
   offset="$(echo $line | sed -e 's/.*area_offset=\"\([a-f0-9x]*\)\".*/\1/')"
-  eval let \
-    fw${i}_offset="$offset"
+  eval fw${i}_offset=$((offset))
   size="$(echo $line | sed -e 's/.*area_size=\"\([a-f0-9x]*\)\".*/\1/')"
-  eval let \
-    fw${i}_size="$size"
+  eval fw${i}_size=$((size))
 done
 
 temp_fwimage=$(make_temp_file)
 temp_out_vb=$(make_temp_file)
 
 # Extract out Firmware A data and generate signature using the right keys
 dd if="${src_fd}" of="${temp_fwimage}" skip="${fwA_offset}" bs=1 \
   count="${fwA_size}"
 
 echo "Re-calculating Firmware A vblock"
@@ skipping 20 matching lines @@
   --signprivate "${firmware_datakey}" \
   --version "${VERSION}" \
   --fv "${temp_fwimage}" \
   --kernelkey "${kernel_subkey}"
 
 # Destination image has already been created.
 dd if="${temp_out_vb}" of="${dst_fd}" seek="${fwB_vblock_offset}" bs=1 \
   count="${fwB_vblock_size}" conv=notrunc
 
 echo "New signed image was output to ${dst_fd}"