--- ec2-api-tools-1.3.46266.orig/debian/ec2-api-tools.install
+++ ec2-api-tools-1.3.46266/debian/ec2-api-tools.install
@@ -0,0 +1,2 @@
+bin/* usr/bin
+lib/* usr/lib/ec2-api-tools
--- ec2-api-tools-1.3.46266.orig/debian/copyright
+++ ec2-api-tools-1.3.46266/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Chuck Short <chuck.short@canonical.com> on
+Wed, 18 Mar 2009 09:03:37 -0400.
+
+It was downloaded from <http://ec2-downloads.s3.amazonaws.com>
+
+Upstream Author(s):
+
+    Amazon.com
+
+Copyright:
+
+    Copyright 2008 Amazon.com  Inc or its affiliates.
+
+License:
+
+    Licensed under the Amazon Software License (the
+    "License").  You may not use this file except in compliance with the
+    License. A copy of the License is located at
+    http://aws.amazon.com/asl or in the "license" file accompanying this
+    file.  This file is distributed on an "AS IS" BASIS, WITHOUT
+    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+    the License for the specific language governing permissions and
+    limitations under the License
+
+The Debian packaging is copyright 2009, Chuck Short<chuck.short@canonical.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
--- ec2-api-tools-1.3.46266.orig/debian/rules
+++ ec2-api-tools-1.3.46266/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+binary-post-install/ec2-api-tools::
+	# we need no stinking windows batch scripts
+	rm  -f debian/ec2-api-tools/usr/bin/*.cmd
--- ec2-api-tools-1.3.46266.orig/debian/docs
+++ ec2-api-tools-1.3.46266/debian/docs
@@ -0,0 +1,3 @@
+license.txt
+notice.txt
+THIRDPARTYLICENSE.TXT
--- ec2-api-tools-1.3.46266.orig/debian/control
+++ ec2-api-tools-1.3.46266/debian/control
@@ -0,0 +1,13 @@
+Source: ec2-api-tools
+Section: admin
+Priority: extra
+Maintainer: Chuck Short <zulcss@ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 5), quilt
+Standards-Version: 3.8.0
+
+Package: ec2-api-tools
+Architecture: all
+Depends: ${misc:Depends}, openjdk-6-jre | openjdk-6-jre-headless
+Description: Amazon EC2 API tools
+ The Amazon EC2 API tools are command-line utilities to help manage an 
+ Amazon Machine Image (AMI), manage firewalls and other utilities.
--- ec2-api-tools-1.3.46266.orig/debian/changelog
+++ ec2-api-tools-1.3.46266/debian/changelog
@@ -0,0 +1,61 @@
+ec2-api-tools (1.3.46266-0ubuntu1~hardy1) hardy; urgency=low
+
+  * New upstream release. API version 2009-11-30: Spot Instances
+
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 15 Dec 2009 15:26:23 -0500
+
+ec2-api-tools (1.3.45772-0ubuntu1) lucid; urgency=low
+
+  * New upstream release. support 2009-10-31 api (EBS root, us-west-1)
+  * change using bash to sh and use exec in wrapper scripts
+
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 07 Dec 2009 15:54:43 -0500
+
+ec2-api-tools (1.3.42584-0ubuntu1) lucid; urgency=low
+
+  *  New release.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 17 Nov 2009 10:02:53 -0500
+
+ec2-api-tools (1.3.36506-0ubuntu5) karmic; urgency=low
+
+  * debian/patches/ubuntu-fix-paths.patch: Include
+    ec2{{u,}min,-{un,}monitor-instances}. (LP: #419464)
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 09 Sep 2009 11:16:34 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu4) karmic; urgency=low
+
+  * ec2-cmd: remove need for setting JAVA_HOME (LP: #410328)
+
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 12 Aug 2009 16:20:54 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu3) karmic; urgency=low
+
+  * Really fix cmd wrappers. Thanks to Ville Aine. (LP: #363931) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 12 Aug 2009 09:31:15 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu2) karmic; urgency=low
+
+  * Remove *.cmd wrappers (LP: #363931) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 08 Jun 2009 08:57:31 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu1) karmic; urgency=low
+
+  * New version.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 01 Jun 2009 20:19:17 -0400
+
+ec2-api-tools (1.3.34128-0ubuntu2) jaunty; urgency=low
+
+  * Update copyright. 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 25 Mar 2009 19:01:28 -0400
+
+ec2-api-tools (1.3.34128-0ubuntu1) jaunty; urgency=low
+
+  * Initial release.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 18 Mar 2009 09:03:37 -0400
--- ec2-api-tools-1.3.46266.orig/debian/compat
+++ ec2-api-tools-1.3.46266/debian/compat
@@ -0,0 +1 @@
+5
--- ec2-api-tools-1.3.46266.orig/debian/patches/ubuntu-do-not-require-java-home.patch
+++ ec2-api-tools-1.3.46266/debian/patches/ubuntu-do-not-require-java-home.patch
@@ -0,0 +1,39 @@
+=== modified file 'bin/ec2-cmd'
+--- ec2-api-tools.old/bin/ec2-cmd	2009-03-18 09:03:37 +0000
++++ ec2-api-tools-1.3.45772/bin/ec2-cmd	2009-12-07 20:50:05 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the 
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the 
+@@ -10,11 +10,8 @@
+ # for maintainability.
+ 
+ # 'Globals'
+-EC2_HOME=${EC2_HOME:-EC2_HOME is not set}
+-LIBDIR=$EC2_HOME/lib
+-
+-# Check our Java env
+-JAVA_HOME=${JAVA_HOME:?JAVA_HOME is not set}
++EC2_HOME=/usr/lib/ec2-api-tools
++LIBDIR=${EC2_HOME}
+ 
+ # If a classpath exists preserve it
+ CP=$CLASSPATH
+@@ -29,7 +26,7 @@
+ cygprop=""
+ 
+ # And add our own libraries too
+-if [ "$cygwin" == "true" ] ; then
++if [ "$cygwin" = "true" ] ; then
+ 	cygprop="-Dec2.cygwin=true"
+ 
+ 	# Make sure that when using Cygwin we use Unix 
+@@ -58,4 +55,4 @@
+ 
+ CMD=$1
+ shift
+-"$JAVA_HOME/bin/java" $EC2_JVM_ARGS $cygprop -classpath "$CP" com.amazon.aes.webservices.client.cmd.$CMD "$@"
++exec java $EC2_JVM_ARGS $cygprop -classpath "$CP" com.amazon.aes.webservices.client.cmd.$CMD "$@"
+
--- ec2-api-tools-1.3.46266.orig/debian/patches/ubuntu-fix-paths.patch
+++ ec2-api-tools-1.3.46266/debian/patches/ubuntu-fix-paths.patch
@@ -0,0 +1,2974 @@
+This patch just modifies all the bin/* files other than .cmd and ec2cmd
+It does 2 things:
+- changes '#!/usr/bin/env bash' to '#!/bin/sh'
+- exec ec2-cmd in path rather than explicit in /usr
+
+To generate the patch, I made made changes to 1 file, saved that in 'newcmd'
+and set the first java option in that file to to "CMD_NAME". then
+ran the following to change all scripts:
+
+for x in bin/*; do 
+   [ "${x%.cmd}" != "${x}" -o "$x" = "bin/ec2-cmd" ] && continue; 
+   # grab the first argument to ec2-cmd from the script
+   cmd=$(awk '$1 ~ /ec2-cmd$/ { print $2 }' "$x"); 
+   echo "$x:${cmd}"; sed "s,CMD_NAME,${cmd}," < ../newcmd > "${x}"
+done
+
+=== modified file 'bin/ec2-add-group'
+--- ec2-api-tools.orig/bin/ec2-add-group	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-add-group	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AddGroup "$@"
++exec ec2-cmd AddGroup "$@"
+
+=== modified file 'bin/ec2-add-keypair'
+--- ec2-api-tools.orig/bin/ec2-add-keypair	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-add-keypair	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateKeyPair "$@"
++exec ec2-cmd CreateKeyPair "$@"
+
+=== modified file 'bin/ec2-allocate-address'
+--- ec2-api-tools.orig/bin/ec2-allocate-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-allocate-address	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AllocateAddress "$@"
++exec ec2-cmd AllocateAddress "$@"
+
+=== modified file 'bin/ec2-associate-address'
+--- ec2-api-tools.orig/bin/ec2-associate-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-associate-address	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AssociateAddress "$@"
++exec ec2-cmd AssociateAddress "$@"
+
+=== modified file 'bin/ec2-associate-dhcp-options'
+--- ec2-api-tools.orig/bin/ec2-associate-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-associate-dhcp-options	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AssociateDhcpOptions "$@"
++exec ec2-cmd AssociateDhcpOptions "$@"
+
+=== modified file 'bin/ec2-attach-volume'
+--- ec2-api-tools.orig/bin/ec2-attach-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-attach-volume	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AttachVolume "$@"
++exec ec2-cmd AttachVolume "$@"
+
+=== modified file 'bin/ec2-attach-vpn-gateway'
+--- ec2-api-tools.orig/bin/ec2-attach-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-attach-vpn-gateway	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AttachVpnGateway "$@"
++exec ec2-cmd AttachVpnGateway "$@"
+
+=== modified file 'bin/ec2-authorize'
+--- ec2-api-tools.orig/bin/ec2-authorize	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-authorize	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AuthorizeGroup "$@"
++exec ec2-cmd AuthorizeGroup "$@"
+
+=== modified file 'bin/ec2-bundle-instance'
+--- ec2-api-tools.orig/bin/ec2-bundle-instance	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-bundle-instance	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd BundleInstance "$@"
++exec ec2-cmd BundleInstance "$@"
+
+=== modified file 'bin/ec2-cancel-bundle-task'
+--- ec2-api-tools.orig/bin/ec2-cancel-bundle-task	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-cancel-bundle-task	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CancelBundleTask "$@"
++exec ec2-cmd CancelBundleTask "$@"
+
+=== modified file 'bin/ec2-cancel-spot-instance-requests'
+--- ec2-api-tools.orig/bin/ec2-cancel-spot-instance-requests	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-cancel-spot-instance-requests	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CancelSpotInstanceRequests "$@"
++exec ec2-cmd CancelSpotInstanceRequests "$@"
+
+=== modified file 'bin/ec2-confirm-product-instance'
+--- ec2-api-tools.orig/bin/ec2-confirm-product-instance	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-confirm-product-instance	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ConfirmProductInstance "$@"
++exec ec2-cmd ConfirmProductInstance "$@"
+
+=== modified file 'bin/ec2-create-customer-gateway'
+--- ec2-api-tools.orig/bin/ec2-create-customer-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-customer-gateway	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateCustomerGateway "$@"
++exec ec2-cmd CreateCustomerGateway "$@"
+
+=== modified file 'bin/ec2-create-dhcp-options'
+--- ec2-api-tools.orig/bin/ec2-create-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-dhcp-options	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateDhcpOptions "$@"
++exec ec2-cmd CreateDhcpOptions "$@"
+
+=== modified file 'bin/ec2-create-image'
+--- ec2-api-tools.orig/bin/ec2-create-image	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-image	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateImage "$@"
++exec ec2-cmd CreateImage "$@"
+
+=== modified file 'bin/ec2-create-snapshot'
+--- ec2-api-tools.orig/bin/ec2-create-snapshot	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-snapshot	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSnapshot "$@"
++exec ec2-cmd CreateSnapshot "$@"
+
+=== modified file 'bin/ec2-create-spot-datafeed-subscription'
+--- ec2-api-tools.orig/bin/ec2-create-spot-datafeed-subscription	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-spot-datafeed-subscription	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSpotDatafeedSubscription "$@"
++exec ec2-cmd CreateSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2-create-subnet'
+--- ec2-api-tools.orig/bin/ec2-create-subnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-subnet	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSubnet "$@"
++exec ec2-cmd CreateSubnet "$@"
+
+=== modified file 'bin/ec2-create-volume'
+--- ec2-api-tools.orig/bin/ec2-create-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-volume	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVolume "$@"
++exec ec2-cmd CreateVolume "$@"
+
+=== modified file 'bin/ec2-create-vpc'
+--- ec2-api-tools.orig/bin/ec2-create-vpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-vpc	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVpc "$@"
++exec ec2-cmd CreateVpc "$@"
+
+=== modified file 'bin/ec2-create-vpn-connection'
+--- ec2-api-tools.orig/bin/ec2-create-vpn-connection	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-vpn-connection	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVpnConnection "$@"
++exec ec2-cmd CreateVpnConnection "$@"
+
+=== modified file 'bin/ec2-create-vpn-gateway'
+--- ec2-api-tools.orig/bin/ec2-create-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-vpn-gateway	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVpnGateway "$@"
++exec ec2-cmd CreateVpnGateway "$@"
+
+=== modified file 'bin/ec2-delete-customer-gateway'
+--- ec2-api-tools.orig/bin/ec2-delete-customer-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-customer-gateway	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteCustomerGateway "$@"
++exec ec2-cmd DeleteCustomerGateway "$@"
+
+=== modified file 'bin/ec2-delete-dhcp-options'
+--- ec2-api-tools.orig/bin/ec2-delete-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-dhcp-options	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteDhcpOptions "$@"
++exec ec2-cmd DeleteDhcpOptions "$@"
+
+=== modified file 'bin/ec2-delete-group'
+--- ec2-api-tools.orig/bin/ec2-delete-group	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-group	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteGroup "$@"
++exec ec2-cmd DeleteGroup "$@"
+
+=== modified file 'bin/ec2-delete-keypair'
+--- ec2-api-tools.orig/bin/ec2-delete-keypair	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-keypair	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteKeyPair "$@"
++exec ec2-cmd DeleteKeyPair "$@"
+
+=== modified file 'bin/ec2-delete-snapshot'
+--- ec2-api-tools.orig/bin/ec2-delete-snapshot	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-snapshot	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSnapshot "$@"
++exec ec2-cmd DeleteSnapshot "$@"
+
+=== modified file 'bin/ec2-delete-spot-datafeed-subscription'
+--- ec2-api-tools.orig/bin/ec2-delete-spot-datafeed-subscription	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-spot-datafeed-subscription	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@"
++exec ec2-cmd DeleteSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2-delete-subnet'
+--- ec2-api-tools.orig/bin/ec2-delete-subnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-subnet	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSubnet "$@"
++exec ec2-cmd DeleteSubnet "$@"
+
+=== modified file 'bin/ec2-delete-volume'
+--- ec2-api-tools.orig/bin/ec2-delete-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-volume	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVolume "$@"
++exec ec2-cmd DeleteVolume "$@"
+
+=== modified file 'bin/ec2-delete-vpc'
+--- ec2-api-tools.orig/bin/ec2-delete-vpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-vpc	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVpc "$@"
++exec ec2-cmd DeleteVpc "$@"
+
+=== modified file 'bin/ec2-delete-vpn-connection'
+--- ec2-api-tools.orig/bin/ec2-delete-vpn-connection	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-vpn-connection	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVpnConnection "$@"
++exec ec2-cmd DeleteVpnConnection "$@"
+
+=== modified file 'bin/ec2-delete-vpn-gateway'
+--- ec2-api-tools.orig/bin/ec2-delete-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-vpn-gateway	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVpnGateway "$@"
++exec ec2-cmd DeleteVpnGateway "$@"
+
+=== modified file 'bin/ec2-deregister'
+--- ec2-api-tools.orig/bin/ec2-deregister	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-deregister	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeregisterImage "$@"
++exec ec2-cmd DeregisterImage "$@"
+
+=== modified file 'bin/ec2-describe-addresses'
+--- ec2-api-tools.orig/bin/ec2-describe-addresses	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-addresses	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeAddresses "$@"
++exec ec2-cmd DescribeAddresses "$@"
+
+=== modified file 'bin/ec2-describe-availability-zones'
+--- ec2-api-tools.orig/bin/ec2-describe-availability-zones	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-availability-zones	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeAvailabilityZones "$@"
++exec ec2-cmd DescribeAvailabilityZones "$@"
+
+=== modified file 'bin/ec2-describe-bundle-tasks'
+--- ec2-api-tools.orig/bin/ec2-describe-bundle-tasks	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-bundle-tasks	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeBundleTasks "$@"
++exec ec2-cmd DescribeBundleTasks "$@"
+
+=== modified file 'bin/ec2-describe-customer-gateways'
+--- ec2-api-tools.orig/bin/ec2-describe-customer-gateways	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-customer-gateways	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeCustomerGateways "$@"
++exec ec2-cmd DescribeCustomerGateways "$@"
+
+=== modified file 'bin/ec2-describe-dhcp-options'
+--- ec2-api-tools.orig/bin/ec2-describe-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-dhcp-options	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeDhcpOptions "$@"
++exec ec2-cmd DescribeDhcpOptions "$@"
+
+=== modified file 'bin/ec2-describe-group'
+--- ec2-api-tools.orig/bin/ec2-describe-group	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-group	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeGroups "$@"
++exec ec2-cmd DescribeGroups "$@"
+
+=== modified file 'bin/ec2-describe-image-attribute'
+--- ec2-api-tools.orig/bin/ec2-describe-image-attribute	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-image-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeImageAttribute "$@"
++exec ec2-cmd DescribeImageAttribute "$@"
+
+=== modified file 'bin/ec2-describe-images'
+--- ec2-api-tools.orig/bin/ec2-describe-images	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-images	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeImages "$@"
++exec ec2-cmd DescribeImages "$@"
+
+=== modified file 'bin/ec2-describe-instance-attribute'
+--- ec2-api-tools.orig/bin/ec2-describe-instance-attribute	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-instance-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeInstanceAttribute "$@"
++exec ec2-cmd DescribeInstanceAttribute "$@"
+
+=== modified file 'bin/ec2-describe-instances'
+--- ec2-api-tools.orig/bin/ec2-describe-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeInstances "$@"
++exec ec2-cmd DescribeInstances "$@"
+
+=== modified file 'bin/ec2-describe-keypairs'
+--- ec2-api-tools.orig/bin/ec2-describe-keypairs	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-keypairs	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeKeyPairs "$@"
++exec ec2-cmd DescribeKeyPairs "$@"
+
+=== modified file 'bin/ec2-describe-regions'
+--- ec2-api-tools.orig/bin/ec2-describe-regions	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-regions	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeRegions "$@"
++exec ec2-cmd DescribeRegions "$@"
+
+=== modified file 'bin/ec2-describe-reserved-instances'
+--- ec2-api-tools.orig/bin/ec2-describe-reserved-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-reserved-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeReservedInstances "$@"
++exec ec2-cmd DescribeReservedInstances "$@"
+
+=== modified file 'bin/ec2-describe-reserved-instances-offerings'
+--- ec2-api-tools.orig/bin/ec2-describe-reserved-instances-offerings	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-reserved-instances-offerings	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeReservedInstancesOfferings "$@"
++exec ec2-cmd DescribeReservedInstancesOfferings "$@"
+
+=== modified file 'bin/ec2-describe-snapshot-attribute'
+--- ec2-api-tools.orig/bin/ec2-describe-snapshot-attribute	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-snapshot-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSnapshotAttribute "$@"
++exec ec2-cmd DescribeSnapshotAttribute "$@"
+
+=== modified file 'bin/ec2-describe-snapshots'
+--- ec2-api-tools.orig/bin/ec2-describe-snapshots	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-snapshots	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSnapshots "$@"
++exec ec2-cmd DescribeSnapshots "$@"
+
+=== modified file 'bin/ec2-describe-spot-datafeed-subscription'
+--- ec2-api-tools.orig/bin/ec2-describe-spot-datafeed-subscription	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-spot-datafeed-subscription	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@"
++exec ec2-cmd DescribeSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2-describe-spot-instance-requests'
+--- ec2-api-tools.orig/bin/ec2-describe-spot-instance-requests	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-spot-instance-requests	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotInstanceRequests "$@"
++exec ec2-cmd DescribeSpotInstanceRequests "$@"
+
+=== modified file 'bin/ec2-describe-spot-price-history'
+--- ec2-api-tools.orig/bin/ec2-describe-spot-price-history	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-spot-price-history	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotPriceHistory "$@"
++exec ec2-cmd DescribeSpotPriceHistory "$@"
+
+=== modified file 'bin/ec2-describe-subnets'
+--- ec2-api-tools.orig/bin/ec2-describe-subnets	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-subnets	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSubnets "$@"
++exec ec2-cmd DescribeSubnets "$@"
+
+=== modified file 'bin/ec2-describe-volumes'
+--- ec2-api-tools.orig/bin/ec2-describe-volumes	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-volumes	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVolumes "$@"
++exec ec2-cmd DescribeVolumes "$@"
+
+=== modified file 'bin/ec2-describe-vpcs'
+--- ec2-api-tools.orig/bin/ec2-describe-vpcs	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-vpcs	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVpcs "$@"
++exec ec2-cmd DescribeVpcs "$@"
+
+=== modified file 'bin/ec2-describe-vpn-connections'
+--- ec2-api-tools.orig/bin/ec2-describe-vpn-connections	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-vpn-connections	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVpnConnections "$@"
++exec ec2-cmd DescribeVpnConnections "$@"
+
+=== modified file 'bin/ec2-describe-vpn-gateways'
+--- ec2-api-tools.orig/bin/ec2-describe-vpn-gateways	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-vpn-gateways	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVpnGateways "$@"
++exec ec2-cmd DescribeVpnGateways "$@"
+
+=== modified file 'bin/ec2-detach-volume'
+--- ec2-api-tools.orig/bin/ec2-detach-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-detach-volume	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DetachVolume "$@"
++exec ec2-cmd DetachVolume "$@"
+
+=== modified file 'bin/ec2-detach-vpn-gateway'
+--- ec2-api-tools.orig/bin/ec2-detach-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-detach-vpn-gateway	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DetachVpnGateway "$@"
++exec ec2-cmd DetachVpnGateway "$@"
+
+=== modified file 'bin/ec2-disassociate-address'
+--- ec2-api-tools.orig/bin/ec2-disassociate-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-disassociate-address	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DisassociateAddress "$@"
++exec ec2-cmd DisassociateAddress "$@"
+
+=== modified file 'bin/ec2-fingerprint-key'
+--- ec2-api-tools.orig/bin/ec2-fingerprint-key	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-fingerprint-key	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd FingerprintKey "$@"
++exec ec2-cmd FingerprintKey "$@"
+
+=== modified file 'bin/ec2-get-console-output'
+--- ec2-api-tools.orig/bin/ec2-get-console-output	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-get-console-output	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd GetConsoleOutput "$@"
++exec ec2-cmd GetConsoleOutput "$@"
+
+=== modified file 'bin/ec2-get-password'
+--- ec2-api-tools.orig/bin/ec2-get-password	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-get-password	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd GetPassword "$@"
++exec ec2-cmd GetPassword "$@"
+
+=== modified file 'bin/ec2-migrate-image'
+--- ec2-api-tools.orig/bin/ec2-migrate-image	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-migrate-image	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd MigrateBundle "$@"
++exec ec2-cmd MigrateBundle "$@"
+
+=== modified file 'bin/ec2-modify-image-attribute'
+--- ec2-api-tools.orig/bin/ec2-modify-image-attribute	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-modify-image-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifyImageAttribute "$@"
++exec ec2-cmd ModifyImageAttribute "$@"
+
+=== modified file 'bin/ec2-modify-instance-attribute'
+--- ec2-api-tools.orig/bin/ec2-modify-instance-attribute	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-modify-instance-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifyInstanceAttribute "$@"
++exec ec2-cmd ModifyInstanceAttribute "$@"
+
+=== modified file 'bin/ec2-modify-snapshot-attribute'
+--- ec2-api-tools.orig/bin/ec2-modify-snapshot-attribute	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-modify-snapshot-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifySnapshotAttribute "$@"
++exec ec2-cmd ModifySnapshotAttribute "$@"
+
+=== modified file 'bin/ec2-monitor-instances'
+--- ec2-api-tools.orig/bin/ec2-monitor-instances	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2-monitor-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd MonitorInstances "$@"
++exec ec2-cmd MonitorInstances "$@"
+
+=== modified file 'bin/ec2-purchase-reserved-instances-offering'
+--- ec2-api-tools.orig/bin/ec2-purchase-reserved-instances-offering	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-purchase-reserved-instances-offering	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd PurchaseReservedInstancesOffering "$@"
++exec ec2-cmd PurchaseReservedInstancesOffering "$@"
+
+=== modified file 'bin/ec2-reboot-instances'
+--- ec2-api-tools.orig/bin/ec2-reboot-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-reboot-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RebootInstances "$@"
++exec ec2-cmd RebootInstances "$@"
+
+=== modified file 'bin/ec2-register'
+--- ec2-api-tools.orig/bin/ec2-register	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-register	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RegisterImage "$@"
++exec ec2-cmd RegisterImage "$@"
+
+=== modified file 'bin/ec2-release-address'
+--- ec2-api-tools.orig/bin/ec2-release-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-release-address	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ReleaseAddress "$@"
++exec ec2-cmd ReleaseAddress "$@"
+
+=== modified file 'bin/ec2-request-spot-instances'
+--- ec2-api-tools.orig/bin/ec2-request-spot-instances	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-request-spot-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RequestSpotInstances "$@"
++exec ec2-cmd RequestSpotInstances "$@"
+
+=== modified file 'bin/ec2-reset-image-attribute'
+--- ec2-api-tools.orig/bin/ec2-reset-image-attribute	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-reset-image-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetImageAttribute "$@"
++exec ec2-cmd ResetImageAttribute "$@"
+
+=== modified file 'bin/ec2-reset-instance-attribute'
+--- ec2-api-tools.orig/bin/ec2-reset-instance-attribute	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-reset-instance-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetInstanceAttribute "$@"
++exec ec2-cmd ResetInstanceAttribute "$@"
+
+=== modified file 'bin/ec2-reset-snapshot-attribute'
+--- ec2-api-tools.orig/bin/ec2-reset-snapshot-attribute	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-reset-snapshot-attribute	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetSnapshotAttribute "$@"
++exec ec2-cmd ResetSnapshotAttribute "$@"
+
+=== modified file 'bin/ec2-revoke'
+--- ec2-api-tools.orig/bin/ec2-revoke	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-revoke	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RevokeGroup "$@"
++exec ec2-cmd RevokeGroup "$@"
+
+=== modified file 'bin/ec2-run-instances'
+--- ec2-api-tools.orig/bin/ec2-run-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-run-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RunInstances "$@"
++exec ec2-cmd RunInstances "$@"
+
+=== modified file 'bin/ec2-start-instances'
+--- ec2-api-tools.orig/bin/ec2-start-instances	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-start-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd StartInstances "$@"
++exec ec2-cmd StartInstances "$@"
+
+=== modified file 'bin/ec2-stop-instances'
+--- ec2-api-tools.orig/bin/ec2-stop-instances	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-stop-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd StopInstances "$@"
++exec ec2-cmd StopInstances "$@"
+
+=== modified file 'bin/ec2-terminate-instances'
+--- ec2-api-tools.orig/bin/ec2-terminate-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-terminate-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd TerminateInstances "$@"
++exec ec2-cmd TerminateInstances "$@"
+
+=== modified file 'bin/ec2-unmonitor-instances'
+--- ec2-api-tools.orig/bin/ec2-unmonitor-instances	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2-unmonitor-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd UnmonitorInstances "$@"
++exec ec2-cmd UnmonitorInstances "$@"
+
+=== modified file 'bin/ec2-version'
+--- ec2-api-tools.orig/bin/ec2-version	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-version	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ShowVersion "$@"
++exec ec2-cmd ShowVersion "$@"
+
+=== modified file 'bin/ec2addcgw'
+--- ec2-api-tools.orig/bin/ec2addcgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addcgw	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateCustomerGateway "$@"
++exec ec2-cmd CreateCustomerGateway "$@"
+
+=== modified file 'bin/ec2adddopt'
+--- ec2-api-tools.orig/bin/ec2adddopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2adddopt	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateDhcpOptions "$@"
++exec ec2-cmd CreateDhcpOptions "$@"
+
+=== modified file 'bin/ec2addgrp'
+--- ec2-api-tools.orig/bin/ec2addgrp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addgrp	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AddGroup "$@"
++exec ec2-cmd AddGroup "$@"
+
+=== modified file 'bin/ec2addkey'
+--- ec2-api-tools.orig/bin/ec2addkey	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addkey	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateKeyPair "$@"
++exec ec2-cmd CreateKeyPair "$@"
+
+=== modified file 'bin/ec2addsds'
+--- ec2-api-tools.orig/bin/ec2addsds	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2addsds	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSpotDatafeedSubscription "$@"
++exec ec2-cmd CreateSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2addsnap'
+--- ec2-api-tools.orig/bin/ec2addsnap	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addsnap	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSnapshot "$@"
++exec ec2-cmd CreateSnapshot "$@"
+
+=== modified file 'bin/ec2addsubnet'
+--- ec2-api-tools.orig/bin/ec2addsubnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addsubnet	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSubnet "$@"
++exec ec2-cmd CreateSubnet "$@"
+
+=== modified file 'bin/ec2addvgw'
+--- ec2-api-tools.orig/bin/ec2addvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addvgw	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVpnGateway "$@"
++exec ec2-cmd CreateVpnGateway "$@"
+
+=== modified file 'bin/ec2addvol'
+--- ec2-api-tools.orig/bin/ec2addvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addvol	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVolume "$@"
++exec ec2-cmd CreateVolume "$@"
+
+=== modified file 'bin/ec2addvpc'
+--- ec2-api-tools.orig/bin/ec2addvpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addvpc	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVpc "$@"
++exec ec2-cmd CreateVpc "$@"
+
+=== modified file 'bin/ec2addvpn'
+--- ec2-api-tools.orig/bin/ec2addvpn	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addvpn	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateVpnConnection "$@"
++exec ec2-cmd CreateVpnConnection "$@"
+
+=== modified file 'bin/ec2allocaddr'
+--- ec2-api-tools.orig/bin/ec2allocaddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2allocaddr	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AllocateAddress "$@"
++exec ec2-cmd AllocateAddress "$@"
+
+=== modified file 'bin/ec2assocaddr'
+--- ec2-api-tools.orig/bin/ec2assocaddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2assocaddr	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AssociateAddress "$@"
++exec ec2-cmd AssociateAddress "$@"
+
+=== modified file 'bin/ec2assocdopt'
+--- ec2-api-tools.orig/bin/ec2assocdopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2assocdopt	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AssociateDhcpOptions "$@"
++exec ec2-cmd AssociateDhcpOptions "$@"
+
+=== modified file 'bin/ec2attvgw'
+--- ec2-api-tools.orig/bin/ec2attvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2attvgw	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AttachVpnGateway "$@"
++exec ec2-cmd AttachVpnGateway "$@"
+
+=== modified file 'bin/ec2attvol'
+--- ec2-api-tools.orig/bin/ec2attvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2attvol	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AttachVolume "$@"
++exec ec2-cmd AttachVolume "$@"
+
+=== modified file 'bin/ec2auth'
+--- ec2-api-tools.orig/bin/ec2auth	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2auth	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd AuthorizeGroup "$@"
++exec ec2-cmd AuthorizeGroup "$@"
+
+=== modified file 'bin/ec2bundle'
+--- ec2-api-tools.orig/bin/ec2bundle	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2bundle	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd BundleInstance "$@"
++exec ec2-cmd BundleInstance "$@"
+
+=== modified file 'bin/ec2cbun'
+--- ec2-api-tools.orig/bin/ec2cbun	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2cbun	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CancelBundleTask "$@"
++exec ec2-cmd CancelBundleTask "$@"
+
+=== modified file 'bin/ec2cim'
+--- ec2-api-tools.orig/bin/ec2cim	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2cim	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateImage "$@"
++exec ec2-cmd CreateImage "$@"
+
+=== modified file 'bin/ec2cpi'
+--- ec2-api-tools.orig/bin/ec2cpi	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2cpi	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ConfirmProductInstance "$@"
++exec ec2-cmd ConfirmProductInstance "$@"
+
+=== modified file 'bin/ec2csir'
+--- ec2-api-tools.orig/bin/ec2csir	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2csir	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CancelSpotInstanceRequests "$@"
++exec ec2-cmd CancelSpotInstanceRequests "$@"
+
+=== modified file 'bin/ec2daddr'
+--- ec2-api-tools.orig/bin/ec2daddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2daddr	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeAddresses "$@"
++exec ec2-cmd DescribeAddresses "$@"
+
+=== modified file 'bin/ec2datt'
+--- ec2-api-tools.orig/bin/ec2datt	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2datt	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeImageAttribute "$@"
++exec ec2-cmd DescribeImageAttribute "$@"
+
+=== modified file 'bin/ec2daz'
+--- ec2-api-tools.orig/bin/ec2daz	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2daz	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeAvailabilityZones "$@"
++exec ec2-cmd DescribeAvailabilityZones "$@"
+
+=== modified file 'bin/ec2dbun'
+--- ec2-api-tools.orig/bin/ec2dbun	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dbun	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeBundleTasks "$@"
++exec ec2-cmd DescribeBundleTasks "$@"
+
+=== modified file 'bin/ec2dcgw'
+--- ec2-api-tools.orig/bin/ec2dcgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dcgw	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeCustomerGateways "$@"
++exec ec2-cmd DescribeCustomerGateways "$@"
+
+=== modified file 'bin/ec2ddopt'
+--- ec2-api-tools.orig/bin/ec2ddopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2ddopt	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeDhcpOptions "$@"
++exec ec2-cmd DescribeDhcpOptions "$@"
+
+=== modified file 'bin/ec2delcgw'
+--- ec2-api-tools.orig/bin/ec2delcgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delcgw	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteCustomerGateway "$@"
++exec ec2-cmd DeleteCustomerGateway "$@"
+
+=== modified file 'bin/ec2deldopt'
+--- ec2-api-tools.orig/bin/ec2deldopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2deldopt	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteDhcpOptions "$@"
++exec ec2-cmd DeleteDhcpOptions "$@"
+
+=== modified file 'bin/ec2delgrp'
+--- ec2-api-tools.orig/bin/ec2delgrp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delgrp	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteGroup "$@"
++exec ec2-cmd DeleteGroup "$@"
+
+=== modified file 'bin/ec2delkey'
+--- ec2-api-tools.orig/bin/ec2delkey	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delkey	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteKeyPair "$@"
++exec ec2-cmd DeleteKeyPair "$@"
+
+=== modified file 'bin/ec2delsds'
+--- ec2-api-tools.orig/bin/ec2delsds	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2delsds	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@"
++exec ec2-cmd DeleteSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2delsnap'
+--- ec2-api-tools.orig/bin/ec2delsnap	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delsnap	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSnapshot "$@"
++exec ec2-cmd DeleteSnapshot "$@"
+
+=== modified file 'bin/ec2delsubnet'
+--- ec2-api-tools.orig/bin/ec2delsubnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delsubnet	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSubnet "$@"
++exec ec2-cmd DeleteSubnet "$@"
+
+=== modified file 'bin/ec2delvgw'
+--- ec2-api-tools.orig/bin/ec2delvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delvgw	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVpnGateway "$@"
++exec ec2-cmd DeleteVpnGateway "$@"
+
+=== modified file 'bin/ec2delvol'
+--- ec2-api-tools.orig/bin/ec2delvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delvol	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVolume "$@"
++exec ec2-cmd DeleteVolume "$@"
+
+=== modified file 'bin/ec2delvpc'
+--- ec2-api-tools.orig/bin/ec2delvpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delvpc	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVpc "$@"
++exec ec2-cmd DeleteVpc "$@"
+
+=== modified file 'bin/ec2delvpn'
+--- ec2-api-tools.orig/bin/ec2delvpn	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delvpn	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteVpnConnection "$@"
++exec ec2-cmd DeleteVpnConnection "$@"
+
+=== modified file 'bin/ec2dereg'
+--- ec2-api-tools.orig/bin/ec2dereg	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dereg	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeregisterImage "$@"
++exec ec2-cmd DeregisterImage "$@"
+
+=== modified file 'bin/ec2detvgw'
+--- ec2-api-tools.orig/bin/ec2detvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2detvgw	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DetachVpnGateway "$@"
++exec ec2-cmd DetachVpnGateway "$@"
+
+=== modified file 'bin/ec2detvol'
+--- ec2-api-tools.orig/bin/ec2detvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2detvol	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DetachVolume "$@"
++exec ec2-cmd DetachVolume "$@"
+
+=== modified file 'bin/ec2dgrp'
+--- ec2-api-tools.orig/bin/ec2dgrp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dgrp	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeGroups "$@"
++exec ec2-cmd DescribeGroups "$@"
+
+=== modified file 'bin/ec2diatt'
+--- ec2-api-tools.orig/bin/ec2diatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2diatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeInstanceAttribute "$@"
++exec ec2-cmd DescribeInstanceAttribute "$@"
+
+=== modified file 'bin/ec2dim'
+--- ec2-api-tools.orig/bin/ec2dim	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dim	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeImages "$@"
++exec ec2-cmd DescribeImages "$@"
+
+=== modified file 'bin/ec2dimatt'
+--- ec2-api-tools.orig/bin/ec2dimatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dimatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeImageAttribute "$@"
++exec ec2-cmd DescribeImageAttribute "$@"
+
+=== modified file 'bin/ec2din'
+--- ec2-api-tools.orig/bin/ec2din	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2din	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeInstances "$@"
++exec ec2-cmd DescribeInstances "$@"
+
+=== modified file 'bin/ec2dinatt'
+--- ec2-api-tools.orig/bin/ec2dinatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2dinatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeInstanceAttribute "$@"
++exec ec2-cmd DescribeInstanceAttribute "$@"
+
+=== modified file 'bin/ec2disaddr'
+--- ec2-api-tools.orig/bin/ec2disaddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2disaddr	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DisassociateAddress "$@"
++exec ec2-cmd DisassociateAddress "$@"
+
+=== modified file 'bin/ec2dkey'
+--- ec2-api-tools.orig/bin/ec2dkey	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dkey	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeKeyPairs "$@"
++exec ec2-cmd DescribeKeyPairs "$@"
+
+=== modified file 'bin/ec2dre'
+--- ec2-api-tools.orig/bin/ec2dre	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dre	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeRegions "$@"
++exec ec2-cmd DescribeRegions "$@"
+
+=== modified file 'bin/ec2dri'
+--- ec2-api-tools.orig/bin/ec2dri	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dri	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeReservedInstances "$@"
++exec ec2-cmd DescribeReservedInstances "$@"
+
+=== modified file 'bin/ec2drio'
+--- ec2-api-tools.orig/bin/ec2drio	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2drio	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeReservedInstancesOfferings "$@"
++exec ec2-cmd DescribeReservedInstancesOfferings "$@"
+
+=== modified file 'bin/ec2dsds'
+--- ec2-api-tools.orig/bin/ec2dsds	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2dsds	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@"
++exec ec2-cmd DescribeSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2dsir'
+--- ec2-api-tools.orig/bin/ec2dsir	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2dsir	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotInstanceRequests "$@"
++exec ec2-cmd DescribeSpotInstanceRequests "$@"
+
+=== modified file 'bin/ec2dsnap'
+--- ec2-api-tools.orig/bin/ec2dsnap	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dsnap	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSnapshots "$@"
++exec ec2-cmd DescribeSnapshots "$@"
+
+=== modified file 'bin/ec2dsnapatt'
+--- ec2-api-tools.orig/bin/ec2dsnapatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dsnapatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSnapshotAttribute "$@"
++exec ec2-cmd DescribeSnapshotAttribute "$@"
+
+=== modified file 'bin/ec2dsph'
+--- ec2-api-tools.orig/bin/ec2dsph	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2dsph	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotPriceHistory "$@"
++exec ec2-cmd DescribeSpotPriceHistory "$@"
+
+=== modified file 'bin/ec2dsubnet'
+--- ec2-api-tools.orig/bin/ec2dsubnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dsubnet	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSubnets "$@"
++exec ec2-cmd DescribeSubnets "$@"
+
+=== modified file 'bin/ec2dvgw'
+--- ec2-api-tools.orig/bin/ec2dvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dvgw	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVpnGateways "$@"
++exec ec2-cmd DescribeVpnGateways "$@"
+
+=== modified file 'bin/ec2dvol'
+--- ec2-api-tools.orig/bin/ec2dvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dvol	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVolumes "$@"
++exec ec2-cmd DescribeVolumes "$@"
+
+=== modified file 'bin/ec2dvpc'
+--- ec2-api-tools.orig/bin/ec2dvpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dvpc	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVpcs "$@"
++exec ec2-cmd DescribeVpcs "$@"
+
+=== modified file 'bin/ec2dvpn'
+--- ec2-api-tools.orig/bin/ec2dvpn	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dvpn	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeVpnConnections "$@"
++exec ec2-cmd DescribeVpnConnections "$@"
+
+=== modified file 'bin/ec2fp'
+--- ec2-api-tools.orig/bin/ec2fp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2fp	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd FingerprintKey "$@"
++exec ec2-cmd FingerprintKey "$@"
+
+=== modified file 'bin/ec2gcons'
+--- ec2-api-tools.orig/bin/ec2gcons	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2gcons	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd GetConsoleOutput "$@"
++exec ec2-cmd GetConsoleOutput "$@"
+
+=== modified file 'bin/ec2gpass'
+--- ec2-api-tools.orig/bin/ec2gpass	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2gpass	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd GetPassword "$@"
++exec ec2-cmd GetPassword "$@"
+
+=== modified file 'bin/ec2kill'
+--- ec2-api-tools.orig/bin/ec2kill	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2kill	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd TerminateInstances "$@"
++exec ec2-cmd TerminateInstances "$@"
+
+=== modified file 'bin/ec2matt'
+--- ec2-api-tools.orig/bin/ec2matt	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2matt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifyImageAttribute "$@"
++exec ec2-cmd ModifyImageAttribute "$@"
+
+=== modified file 'bin/ec2miatt'
+--- ec2-api-tools.orig/bin/ec2miatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2miatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifyInstanceAttribute "$@"
++exec ec2-cmd ModifyInstanceAttribute "$@"
+
+=== modified file 'bin/ec2mim'
+--- ec2-api-tools.orig/bin/ec2mim	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2mim	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd MigrateBundle "$@"
++exec ec2-cmd MigrateBundle "$@"
+
+=== modified file 'bin/ec2mimatt'
+--- ec2-api-tools.orig/bin/ec2mimatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2mimatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifyImageAttribute "$@"
++exec ec2-cmd ModifyImageAttribute "$@"
+
+=== modified file 'bin/ec2min'
+--- ec2-api-tools.orig/bin/ec2min	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2min	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd MonitorInstances "$@"
++exec ec2-cmd MonitorInstances "$@"
+
+=== modified file 'bin/ec2minatt'
+--- ec2-api-tools.orig/bin/ec2minatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2minatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifyInstanceAttribute "$@"
++exec ec2-cmd ModifyInstanceAttribute "$@"
+
+=== modified file 'bin/ec2msnapatt'
+--- ec2-api-tools.orig/bin/ec2msnapatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2msnapatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ModifySnapshotAttribute "$@"
++exec ec2-cmd ModifySnapshotAttribute "$@"
+
+=== modified file 'bin/ec2prio'
+--- ec2-api-tools.orig/bin/ec2prio	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2prio	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd PurchaseReservedInstancesOffering "$@"
++exec ec2-cmd PurchaseReservedInstancesOffering "$@"
+
+=== modified file 'bin/ec2ratt'
+--- ec2-api-tools.orig/bin/ec2ratt	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2ratt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetImageAttribute "$@"
++exec ec2-cmd ResetImageAttribute "$@"
+
+=== modified file 'bin/ec2reboot'
+--- ec2-api-tools.orig/bin/ec2reboot	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2reboot	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RebootInstances "$@"
++exec ec2-cmd RebootInstances "$@"
+
+=== modified file 'bin/ec2reg'
+--- ec2-api-tools.orig/bin/ec2reg	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2reg	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RegisterImage "$@"
++exec ec2-cmd RegisterImage "$@"
+
+=== modified file 'bin/ec2reladdr'
+--- ec2-api-tools.orig/bin/ec2reladdr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2reladdr	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ReleaseAddress "$@"
++exec ec2-cmd ReleaseAddress "$@"
+
+=== modified file 'bin/ec2revoke'
+--- ec2-api-tools.orig/bin/ec2revoke	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2revoke	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RevokeGroup "$@"
++exec ec2-cmd RevokeGroup "$@"
+
+=== modified file 'bin/ec2riatt'
+--- ec2-api-tools.orig/bin/ec2riatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2riatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetInstanceAttribute "$@"
++exec ec2-cmd ResetInstanceAttribute "$@"
+
+=== modified file 'bin/ec2rimatt'
+--- ec2-api-tools.orig/bin/ec2rimatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2rimatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetImageAttribute "$@"
++exec ec2-cmd ResetImageAttribute "$@"
+
+=== modified file 'bin/ec2rinatt'
+--- ec2-api-tools.orig/bin/ec2rinatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2rinatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetInstanceAttribute "$@"
++exec ec2-cmd ResetInstanceAttribute "$@"
+
+=== modified file 'bin/ec2rsi'
+--- ec2-api-tools.orig/bin/ec2rsi	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2rsi	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RequestSpotInstances "$@"
++exec ec2-cmd RequestSpotInstances "$@"
+
+=== modified file 'bin/ec2rsnapatt'
+--- ec2-api-tools.orig/bin/ec2rsnapatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2rsnapatt	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ResetSnapshotAttribute "$@"
++exec ec2-cmd ResetSnapshotAttribute "$@"
+
+=== modified file 'bin/ec2run'
+--- ec2-api-tools.orig/bin/ec2run	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2run	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RunInstances "$@"
++exec ec2-cmd RunInstances "$@"
+
+=== modified file 'bin/ec2start'
+--- ec2-api-tools.orig/bin/ec2start	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2start	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd StartInstances "$@"
++exec ec2-cmd StartInstances "$@"
+
+=== modified file 'bin/ec2stop'
+--- ec2-api-tools.orig/bin/ec2stop	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2stop	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd StopInstances "$@"
++exec ec2-cmd StopInstances "$@"
+
+=== modified file 'bin/ec2umin'
+--- ec2-api-tools.orig/bin/ec2umin	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2umin	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd UnmonitorInstances "$@"
++exec ec2-cmd UnmonitorInstances "$@"
+
+=== modified file 'bin/ec2ver'
+--- ec2-api-tools.orig/bin/ec2ver	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2ver	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd ShowVersion "$@"
++exec ec2-cmd ShowVersion "$@"
+
--- ec2-api-tools-1.3.46266.orig/debian/patches/series
+++ ec2-api-tools-1.3.46266/debian/patches/series
@@ -0,0 +1,2 @@
+ubuntu-fix-paths.patch
+ubuntu-do-not-require-java-home.patch