Merge "Camera: Add trigger metadata entries." into jb-mr2-dev
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 7869763..8e5bf56 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -23,7 +23,7 @@
# ../src/camera_metadata_tags.h
#
-thisdir=$(dirname $(readlink -f $0))
+thisdir=$(cd "$(dirname "$0")"; pwd)
function relpath() {
python -c "import os.path; print os.path.relpath('$1', '$PWD')"
diff --git a/camera/docs/metadata-parser-sanity-check b/camera/docs/metadata-parser-sanity-check
index 520a5f2..76afc48 100755
--- a/camera/docs/metadata-parser-sanity-check
+++ b/camera/docs/metadata-parser-sanity-check
@@ -21,13 +21,13 @@
# as the original parsed data.
#
-thisdir=$(dirname $(readlink -f $0))
+thisdir=$(cd "$(dirname "$0")"; pwd)
$thisdir/metadata-check-dependencies || exit 1
-tmp_out=$(mktemp)
-tmp_tidy1=$(mktemp)
-tmp_tidy2=$(mktemp)
+tmp_out=$(mktemp -t tmp.XXXXXXXXXX)
+tmp_tidy1=$(mktemp -t tmp.XXXXXXXXXX)
+tmp_tidy2=$(mktemp -t tmp.XXXXXXXXXX)
python $thisdir/metadata_parser_xml.py $thisdir/metadata_properties.xml $thisdir/metadata_template.mako $tmp_out || exit 1
tidy -indent -xml -quiet $thisdir/metadata_properties.xml > $tmp_tidy1
diff --git a/camera/docs/metadata-validate b/camera/docs/metadata-validate
index 20ad9e6..d507d8e 100755
--- a/camera/docs/metadata-validate
+++ b/camera/docs/metadata-validate
@@ -16,12 +16,12 @@
# limitations under the License.
#
-thisdir=$(dirname $(readlink -f $0))
+thisdir=$(cd "$(dirname "$0")"; pwd)
$thisdir/metadata-check-dependencies || exit 1
if [[ $# -lt 1 ]]
then
- echo "Usage: $(basename $(readlink -f $0)) <properties-file-name.xml>" 1>&2
+ echo "Usage: ${BASH_SOURCE##*/} <properties-file-name.xml>" 1>&2
exit
fi
