--- ec2-api-tools-1.6.12.0.orig/debian/README.source +++ ec2-api-tools-1.6.12.0/debian/README.source @@ -0,0 +1,74 @@ +=== General Info === +Development packaging branch is at + lp:~awstools-dev/ubuntu//ec2-api-tools/ +for example: + lp:~awstools-dev/ubuntu/natty/ec2-api-tools/natty + +The package uses quilt, but not quilt 3.0. Patches are unapplied in the +source directory. + +=== To upgrade to new zip file from amazon === + +suite=precise +bzr branch lp:~awstools-dev/ubuntu/$suite/ec2-api-tools/$suite upstream-$suite.dist +bzr branch upstream-$suite.dist upstream-$suite + +cd upstream-$suite + +out=$(python ./debian/upstream-check ec2-api-tools) +set -- ${out} +newzip=${1}; date=${2}; size=${3} +./debian/rules get-orig-source +ver=${newzip#ec2-api-tools-}; ver=${ver%.zip} +ver=$(echo "${ver}" | tr '-' '.') + +bzr merge-upstream ../ec2-api-tools-${ver}.tar.gz --version ${ver} +newbins=$(bzr status bin | grep bin/ | grep -v ".cmd") +vi debian/changelog + # mention api version and new function +bzr commit -m "merge with upstream at $ver" + +# update 'debian/patches/ubuntu-fix-paths.patch' patch +p=ubuntu-fix-paths.patch +quilt header ${p} > header +quilt del ${p} +quilt new ${p} +printf '#!/bin/sh\ncat header > "$1"\n' > xed +chmod 755 xed +EDITOR="$PWD/xed" quilt header -e +cat header +## follow instructions in header +## files=... +## sed ... +quilt refresh +rm header xed +quilt pop -a +bzr commit -m "refresh ${p} for ${ver}" debian/patches/${p} + +quilt push -a +./debian/rules debian/ec2-version +quilt pop -a +bzr commit -m "update debian/ec2-version for ${ver}" debian/ec2-version + +# now update name2desc +quilt push -a +sh debian/find-symlinks - ${files} > ../symlinks +updates="" +awk '{print $1}' ../symlinks | sort -u > ../out +while read src dest; do f=${src##*/} ; grep -q $f debian/name2desc || + updates="${updates} ${f}"; done < ../out +chmod 755 bin/ec2-cmd +for f in ${updates}; do + chmod ugo+x bin/${f} + PATH=$PWD/bin:$PATH EC2_BUILD_HOME=$PWD/lib bin/$f --help | + while read line; do [ "${line}" = "DESCRIPTION" ] && + read line && printf "%s\t%s\n" "$f" "NEW: ${line%.}" >> debian/name2desc && break; + done; +done +quilt pop -a +bzr revert bin +cp debian/name2desc ../out +# then, verify/fix NEW: lines (manually) in ../out +# vi ../out +sort -u ../out > debian/name2desc +bzr commit -m "update name2desc for ${ver}" debian/name2desc --- ec2-api-tools-1.6.12.0.orig/debian/changelog +++ ec2-api-tools-1.6.12.0/debian/changelog @@ -0,0 +1,159 @@ +ec2-api-tools (1.6.12.0-0ubuntu1) trusty; urgency=low + + * New upstream release. + * New commands (since 1.6.6.0): + ec2-copy-image ec2-describe-account-attributes + ec2-describe-reserved-instances-modifications ec2-describe-vpc-attribute + ec2-modify-reserved-instances ec2-modify-vpc-attribute + + -- Scott Moser Wed, 20 Nov 2013 15:36:36 -0500 + +ec2-api-tools (1.6.6.0-0ubuntu1) raring; urgency=low + + * New upstream release. API version 2012-12-01. + * New commands (since 1.6.5.3): + ec2-copy-snapshot + + -- Scott Moser Tue, 18 Dec 2012 11:28:38 -0500 + +ec2-api-tools (1.6.5.3-0ubuntu1) raring; urgency=low + + * New upstream release. API version 2012-10-01. + * New commands (since 1.6.1.1): ec2-cancel-reserved-instances-listing + ec2-create-reserved-instances-listing ec2-create-vpn-connection-route + ec2-delete-vpn-connection-route ec2-describe-reserved-instances-listings + ec2-disable-vgw-route-propagation ec2-enable-vgw-route-propagation + * debian/control: update Maintainer, update to standards version 3.9.3 + * debian/upstream-check: sort by last-modified, not by simple version string + * debian/patches/ubuntu-ec2-cmd-fixes.patch, debian/ec2-api-tools.install: + install jar files into /usr/share/ec2-api-tools rather than /usr/lib, + fixing lintian 'jar-not-in-usr-share' warning. + + -- Scott Moser Mon, 10 Dec 2012 20:07:40 -0500 + +ec2-api-tools (1.6.1.1-0ubuntu1) quantal; urgency=low + + * New upstream release (1.6.1.1). API version 2012-07-20. + * New commands (added in 1.6.0.0): assign-private-ip-addresses + attach-network-interface cancel-export-task create-instance-export-task + create-network-interface delete-network-interface describe-export-tasks + describe-network-interface-attribute describe-network-interfaces + describe-volume-attribute describe-volume-status detach-network-interface + enable-volume-io modify-network-interface-attribute + modify-volume-attribute report-instance-status + reset-network-interface-attribute unassign-private-ip-addresses + * add watchfile + + -- Scott Moser Wed, 01 Aug 2012 09:56:45 -0400 + +ec2-api-tools (1.5.0.0-0ubuntu1) precise; urgency=low + + * New upstream release. API version 2011-11-01. (LP: #893365) + * New function includes Instance Status. + + -- Scott Moser Mon, 28 Nov 2011 14:48:56 -0500 + +ec2-api-tools (1.4.3.0-0ubuntu1) oneiric; urgency=low + + * New upstream release. API version 2011-05-15. + * New function includes: + * Support for Amazon Spot Instances Availability Zone Local + Pricing Changes (API version 2011-05-05) + * Dedicated Instances (API version 2011-02-28) + * VPC IA (API version 2011-01-01) + * VM Import (API version 2010-11-15) + * improvements to debian directory + + -- Scott Moser Mon, 06 Jun 2011 13:05:18 -0400 + +ec2-api-tools (1.3.57419-0ubuntu3) natty; urgency=low + + * fix in build generation of man pages + * fix FTBFS (LP: #715818) + + -- Scott Moser Mon, 14 Feb 2011 16:54:43 -0500 + +ec2-api-tools (1.3.57419-0ubuntu2) natty; urgency=low + + * add man pages. (require java for build) + * add exec calls back, so wrapper scripts don't hang around + + -- Scott Moser Tue, 21 Sep 2010 15:48:28 -0400 + +ec2-api-tools (1.3.57419-0ubuntu1) maverick; urgency=low + + * New upstream release. API version 2010-08-31 (LP: #644074) + * Resource Tagging + * Idempotent Instance Creation + * Filtering + * import keypair + + -- Scott Moser Mon, 20 Sep 2010 13:10:04 -0400 + +ec2-api-tools (1.3.53907-0ubuntu1) maverick; urgency=low + + * New upstream release. API version 2010-06-15: Cluster Compute + + -- Scott Moser Tue, 13 Jul 2010 13:45:09 -0400 + +ec2-api-tools (1.3.46266-0ubuntu1) lucid; urgency=low + + * New upstream release. API version 2009-11-30: Spot Instances + + -- Scott Moser Tue, 15 Dec 2009 15:20:07 -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 Mon, 07 Dec 2009 15:54:43 -0500 + +ec2-api-tools (1.3.42584-0ubuntu1) lucid; urgency=low + + * New release. + + -- Chuck Short 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 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 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 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 Mon, 08 Jun 2009 08:57:31 -0400 + +ec2-api-tools (1.3.36506-0ubuntu1) karmic; urgency=low + + * New version. + + -- Chuck Short Mon, 01 Jun 2009 20:19:17 -0400 + +ec2-api-tools (1.3.34128-0ubuntu2) jaunty; urgency=low + + * Update copyright. + + -- Chuck Short Wed, 25 Mar 2009 19:01:28 -0400 + +ec2-api-tools (1.3.34128-0ubuntu1) jaunty; urgency=low + + * Initial release. + + -- Chuck Short Wed, 18 Mar 2009 09:03:37 -0400 --- ec2-api-tools-1.6.12.0.orig/debian/compat +++ ec2-api-tools-1.6.12.0/debian/compat @@ -0,0 +1 @@ +7 --- ec2-api-tools-1.6.12.0.orig/debian/control +++ ec2-api-tools-1.6.12.0/debian/control @@ -0,0 +1,14 @@ +Source: ec2-api-tools +Section: admin +Priority: extra +Maintainer: Ubuntu Developers +Build-Depends: cdbs, debhelper (>= 7), quilt, default-jre-headless | java6-runtime-headless +Standards-Version: 3.9.3 +Homepage: http://aws.amazon.com/developertools/351 + +Package: ec2-api-tools +Architecture: all +Depends: ${misc:Depends}, default-jre-headless | java6-runtime-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.6.12.0.orig/debian/copyright +++ ec2-api-tools-1.6.12.0/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Chuck Short on +Wed, 18 Mar 2009 09:03:37 -0400. + +It was downloaded from + +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 and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- ec2-api-tools-1.6.12.0.orig/debian/docs +++ ec2-api-tools-1.6.12.0/debian/docs @@ -0,0 +1,3 @@ +license.txt +notice.txt +THIRDPARTYLICENSE.TXT --- ec2-api-tools-1.6.12.0.orig/debian/ec2-api-tools.install +++ ec2-api-tools-1.6.12.0/debian/ec2-api-tools.install @@ -0,0 +1,2 @@ +bin/* usr/bin +lib/* usr/share/ec2-api-tools --- ec2-api-tools-1.6.12.0.orig/debian/ec2-version +++ ec2-api-tools-1.6.12.0/debian/ec2-version @@ -0,0 +1 @@ +1.6.12.0 2013-10-15 --- ec2-api-tools-1.6.12.0.orig/debian/find-symlinks +++ ec2-api-tools-1.6.12.0/debian/find-symlinks @@ -0,0 +1,28 @@ +#!/bin/sh +# vi: ts=4 noexpandtab + +set -e; +mf=$(mktemp); +out=$(mktemp); +output=${1} +shift; +trap "rm -f ${mf} $out" EXIT; +md5sum "$@" > "${mf}" + +for p in "$@"; do + [ "${p#ec2-}" = "${p}" ] || continue + cs=$(awk '$2 == p { print $1 }' "p=$p" "${mf}" ) && + [ -n "${cs}" ] || continue + oprog=$(awk '$1 == cs && $2 ~ /ec2-/ { print $2 }' "cs=${cs}" "${mf}") && + [ -n "${oprog}" ] || continue; + echo "$oprog" "$p"; +done > "${out}" + +for p in "$@"; do \ + egrep -q "(^$p|$p$)" "${out}" || echo "$p" >> "${out}"; +done +if [ "${output}" = "-" ]; then + cat "${out}" +else + mv "${out}" "${output}" +fi --- ec2-api-tools-1.6.12.0.orig/debian/name2desc +++ ec2-api-tools-1.6.12.0/debian/name2desc @@ -0,0 +1,157 @@ +ec2-activate-license Activate capacity against a license +ec2-add-group Create a new security group +ec2-add-keypair Generate a new keypair +ec2-allocate-address Allocate an elastic IP address +ec2-assign-private-ip-addresses Assign secondary private IP addresses to the specified network +ec2-associate-address Associate a public address with an instance +ec2-associate-dhcp-options Associate dhcp options to a VPC +ec2-associate-route-table Associate a route table with a subnet +ec2-attach-internet-gateway Attaches an internet gateway to a specified network +ec2-attach-network-interface Attaches a network interface to an instance +ec2-attach-volume Attach an available volume to an instance +ec2-attach-vpn-gateway Attach a VPN gateway to a VPC +ec2-authorize Grant permissions to a specified group +ec2-bundle-instance Bundle a running instance on next reboot +ec2-cancel-bundle-task Cancel a pending or in-progress bundle task +ec2-cancel-conversion-task Deletes a conversion task. Any resources associated with this task, +ec2-cancel-export-task Cancels an active export task +ec2-cancel-reserved-instances-listing Cancel a specified Reserved Instance listing +ec2-cancel-spot-instance-requests Cancel spot instance requests +ec2-confirm-product-instance Confirm an instance product code +ec2-copy-image Copies an AMI to this region from another region +ec2-copy-snapshot Copy a snapshot to this region from another region +ec2-create-customer-gateway Create a VPC gateway +ec2-create-dhcp-options Create a set of DHCP options for a VPC +ec2-create-group Create a new security group +ec2-create-image Register an AMI manifest for use with EC2 +ec2-create-instance-export-task Initiate an instance export task to export a running or stopped +ec2-create-internet-gateway Creates an Internet Gateway +ec2-create-keypair Generate a new keypair +ec2-create-network-acl Create a network ACL +ec2-create-network-acl-entry Create a network ACL entry +ec2-create-network-interface Creates a network interface in the subnet that you specify +ec2-create-placement-group Create a placement group +ec2-create-reserved-instances-listing Create a Reserved Instance listing +ec2-create-route Creates a route in a given route table +ec2-create-route-table Creates a new route table +ec2-create-snapshot Create a snapshot of a volume +ec2-create-spot-datafeed-subscription Create data feed for spot instances +ec2-create-subnet Create a subnet in an existing VPC +ec2-create-tags Add a set of tags +ec2-create-volume Create a new volume +ec2-create-vpc Creates a VPC +ec2-create-vpn-connection Create a VPN connection +ec2-create-vpn-connection-route Create a route for the VPN connection +ec2-create-vpn-gateway Create a new VPN gateway +ec2-deactivate-license Deactivate capacity against a license +ec2-delete-customer-gateway Delete a customer gateway +ec2-delete-dhcp-options Delete a set of DHCP options +ec2-delete-disk-image Delete a partially or fully uploaded disk-image for conversion-tasks +ec2-delete-group Delete an existing security group +ec2-delete-internet-gateway Delete an existing Internet Gateway +ec2-delete-keypair Delete an existing keypair +ec2-delete-network-acl Delete a network ACL +ec2-delete-network-acl-entry Delete a network ACL entry +ec2-delete-network-interface Deletes a network interface +ec2-delete-placement-group Deletes a placement group +ec2-delete-route Delete a route +ec2-delete-route-table Delete a route table +ec2-delete-snapshot Delete a snapshot +ec2-delete-spot-datafeed-subscription Delete the data feed for spot instances +ec2-delete-subnet Delete a subnet from a VPC +ec2-delete-tags Remove a set of tags +ec2-delete-volume Delete an existing volume +ec2-delete-vpc Delete a VPC +ec2-delete-vpn-connection Delete a VPN connection +ec2-delete-vpn-connection-route Delete a route for the VPN connection +ec2-delete-vpn-gateway Delete a VPN gateway +ec2-deregister Deregister a registered image +ec2-describe-account-attributes Describes your AWS account +ec2-describe-addresses List and elastic IP addresses +ec2-describe-availability-zones List availability zones +ec2-describe-bundle-tasks List bundle tasks +ec2-describe-conversion-tasks List and describe your conversion tasks. If the TASK-ID parameter is +ec2-describe-customer-gateways Describe customer gateways +ec2-describe-dhcp-options Describe DHCP options +ec2-describe-export-tasks List and describe your export tasks +ec2-describe-group Describe security groups +ec2-describe-image-attribute Describe an attribute on an image +ec2-describe-images Describe a registered image +ec2-describe-instance-attribute Describe an instance attribute +ec2-describe-instances List instances +ec2-describe-instance-status Describe the status for instances and see if there are any associated events +ec2-describe-internet-gateways List and describe your internet gateways +ec2-describe-keypairs List keypairs +ec2-describe-licenses List licenses +ec2-describe-network-acls Describe either all network ACLs belonging to a user, or specific ACLs designated by IDs +ec2-describe-network-interface-attribute Describes a network interface attribute. +ec2-describe-network-interfaces Gives you information about one or more network interfaces +ec2-describe-placement-groups Describe placement groups +ec2-describe-regions List the regions +ec2-describe-reserved-instances Describe purchased reserved instances +ec2-describe-reserved-instances-listings List information about Reserved Instance listings +ec2-describe-reserved-instances-modifications Describes the modifications made to your Reserved Instances +ec2-describe-reserved-instances-offerings Describe available reserved instances +ec2-describe-route-tables List and describe your route tables +ec2-describe-snapshot-attribute Describe an attribute of a snapshot +ec2-describe-snapshots Describe snapshots +ec2-describe-spot-datafeed-subscription Describes the data feed for spot instances +ec2-describe-spot-instance-requests describe spot instance requests +ec2-describe-spot-price-history List all spot instance price changes +ec2-describe-subnets describe subnets in a VPC +ec2-describe-tags List tags +ec2-describe-volume-attribute Describes a volume attribute. +ec2-describe-volumes describe previously created volumes +ec2-describe-volume-status Describe the status for one or more volumes +ec2-describe-vpc-attribute Describes the attributes of a VPC +ec2-describe-vpcs describe one or more VPCs +ec2-describe-vpn-connections describe one or more VPN connections +ec2-describe-vpn-gateways describe one or more VPN gateways +ec2-detach-internet-gateway Detaches an internet gateway from a specified network +ec2-detach-network-interface Detaches a network interface from an instance. The NETWORKATTACHMENT +ec2-detach-volume Detach an attached volume +ec2-detach-vpn-gateway Detaches a VPN gateway from a VPC +ec2-disable-vgw-route-propagation Disable the propogation of routes from the virtual private gateway +ec2-disassociate-address Disassociate an elastic IP address +ec2-disassociate-route-table Disassociate a route table from a subnet +ec2-enable-vgw-route-propagation Enable the propogation of routes from the virtual private gateway +ec2-enable-volume-io Enable volume IO +ec2-fingerprint-key Generate a fingerprint for a private key +ec2-get-console-output Display the instance's console output +ec2-get-password Fetch admin password for a Windows instance +ec2-import-instance Create an import instance task to import a virtual machine into EC2 +ec2-import-keypair Imports public key for a key pair +ec2-import-volume Create a new import volume task using meta-data from the given disk +ec2-migrate-image Migrates an AMI +ec2-modify-image-attribute Modify an attribute on an Image +ec2-modify-instance-attribute Modify an instance attribute +ec2-modify-network-interface-attribute Modifies a network interface attribute. +ec2-modify-reserved-instances Modifies the Availability Zone, instance count, network platform +ec2-modify-snapshot-attribute Modify a snapshot attribute +ec2-modify-volume-attribute Modifies a volume attribute. +ec2-modify-vpc-attribute Modifies the attributes of a VPC +ec2-monitor-instances Monitor running or pending instances +ec2-purchase-reserved-instances-offering Purchase reserved instances +ec2-reboot-instances Reboot running instances +ec2-register Register image +ec2-release-address Release an an elastic IP address +ec2-replace-network-acl-association Replace a network acl association with a new network ACL +ec2-replace-network-acl-entry Replace an existing network ACL entry +ec2-replace-route Replaces a route in a given route table +ec2-replace-route-table-association Replace an association between a subnet and a route table with a new route table +ec2-report-instance-status Report a discrepancy in the status of one or more of your instances +ec2-request-spot-instances Create a spot instance request +ec2-reset-image-attribute Reset an attribute of an image +ec2-reset-instance-attribute Reset an instance attribute +ec2-reset-network-interface-attribute Resets a network interface attribute. +ec2-reset-snapshot-attribute Reset a snapshot +ec2-resume-import Upload the disk image associated with the conversion task id. +ec2-revoke Revoke permissions from a group +ec2-run-instances Launch instances of an image +ec2-start-instances Start running instances +ec2-stop-instances Stop running instances +ec2-terminate-instances Terminate running instances +ec2-unassign-private-ip-addresses Unassign secondary private IP addresses from the specified network +ec2-unmonitor-instances Unmonitor running or pending instances +ec2-upload-disk-image Upload the disk image associated with the conversion task id +ec2-version Output build and API version --- ec2-api-tools-1.6.12.0.orig/debian/patches/series +++ ec2-api-tools-1.6.12.0/debian/patches/series @@ -0,0 +1,2 @@ +ubuntu-ec2-cmd-fixes.patch +ubuntu-fix-paths.patch --- ec2-api-tools-1.6.12.0.orig/debian/patches/ubuntu-ec2-cmd-fixes.patch +++ ec2-api-tools-1.6.12.0/debian/patches/ubuntu-ec2-cmd-fixes.patch @@ -0,0 +1,47 @@ +=== modified file 'bin/ec2-cmd' +--- a/bin/ec2-cmd ++++ b/bin/ec2-cmd +@@ -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 +@@ -12,25 +12,23 @@ + # 'Globals' + __ZIP_PREFIX__EC2_HOME="${EC2_HOME:-EC2_HOME is not set}" + __RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-LIBDIR="${EC2_HOME}/lib" +- +-# Check our Java env +-JAVA_HOME=${JAVA_HOME:?JAVA_HOME is not set} ++EC2_HOME=${EC2_BUILD_HOME:-/usr/share/ec2-api-tools} ++LIBDIR=${EC2_HOME} + + # If a classpath exists preserve it + CP="${CLASSPATH}" + + # Check for cygwin bash so we use the correct path separator +-case "`uname`" in +- CYGWIN*) cygwin=true;; +-esac ++#case "`uname`" in ++# CYGWIN*) cygwin=true;; ++#esac + + # ---- Start of Cygwin test ---- + + 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 +@@ -59,4 +57,4 @@ fi + + CMD=$1 + shift +-"${JAVA_HOME}/bin/java" ${EC2_JVM_ARGS} ${cygprop} -classpath "${CP}" "com.amazon.aes.webservices.client.cmd.${CMD}" $EC2_DEFAULT_ARGS "$@" ++exec java ${EC2_JVM_ARGS} ${cygprop} -classpath "${CP}" "com.amazon.aes.webservices.client.cmd.${CMD}" $EC2_DEFAULT_ARGS "$@" --- ec2-api-tools-1.6.12.0.orig/debian/patches/ubuntu-fix-paths.patch +++ ec2-api-tools-1.6.12.0/debian/patches/ubuntu-fix-paths.patch @@ -0,0 +1,5152 @@ +This patch just modifies all the bin/* files other than .cmd and ec2cmd +It does these things: +- changes '#!/usr/bin/env bash' to '#!/bin/sh' +- remove set/export of EC2_HOME environment variable +- remove __ZIP_PREFIX usage of ':?' which aborts if EC2_HOME is not present. +- exec ec2-cmd in path rather than explicit in /usr + +To generate the patch, I did: + +files=$(ls bin/* | egrep -v "([.]cmd|ec2-cmd)$") +quilt add $files +sed -i -e 's,^#!/usr/bin/env bash,#!/bin/sh,' -e '/^EC2_HOME=/d' \ + -e '/^__.*_PREFIX__EC2_HOME=/d' \ + -e 's,.*/ec2-cmd \([^ ]*\),exec ec2-cmd \1,' ${files} + + +--- a/bin/ec2-activate-license ++++ b/bin/ec2-activate-license +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ActivateLicense "$@" ++exec ec2-cmd ActivateLicense "$@" +--- a/bin/ec2-add-group ++++ b/bin/ec2-add-group +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AddGroup "$@" ++exec ec2-cmd AddGroup "$@" +--- a/bin/ec2-add-keypair ++++ b/bin/ec2-add-keypair +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateKeyPair "$@" ++exec ec2-cmd CreateKeyPair "$@" +--- a/bin/ec2-allocate-address ++++ b/bin/ec2-allocate-address +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AllocateAddress "$@" ++exec ec2-cmd AllocateAddress "$@" +--- a/bin/ec2-associate-address ++++ b/bin/ec2-associate-address +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssociateAddress "$@" ++exec ec2-cmd AssociateAddress "$@" +--- a/bin/ec2-associate-dhcp-options ++++ b/bin/ec2-associate-dhcp-options +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssociateDhcpOptions "$@" ++exec ec2-cmd AssociateDhcpOptions "$@" +--- a/bin/ec2-attach-volume ++++ b/bin/ec2-attach-volume +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachVolume "$@" ++exec ec2-cmd AttachVolume "$@" +--- a/bin/ec2-attach-vpn-gateway ++++ b/bin/ec2-attach-vpn-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachVpnGateway "$@" ++exec ec2-cmd AttachVpnGateway "$@" +--- a/bin/ec2-authorize ++++ b/bin/ec2-authorize +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AuthorizeGroup "$@" ++exec ec2-cmd AuthorizeGroup "$@" +--- a/bin/ec2-bundle-instance ++++ b/bin/ec2-bundle-instance +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd BundleInstance "$@" ++exec ec2-cmd BundleInstance "$@" +--- a/bin/ec2-cancel-bundle-task ++++ b/bin/ec2-cancel-bundle-task +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelBundleTask "$@" ++exec ec2-cmd CancelBundleTask "$@" +--- a/bin/ec2-cancel-spot-instance-requests ++++ b/bin/ec2-cancel-spot-instance-requests +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelSpotInstanceRequests "$@" ++exec ec2-cmd CancelSpotInstanceRequests "$@" +--- a/bin/ec2-confirm-product-instance ++++ b/bin/ec2-confirm-product-instance +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ConfirmProductInstance "$@" ++exec ec2-cmd ConfirmProductInstance "$@" +--- a/bin/ec2-create-customer-gateway ++++ b/bin/ec2-create-customer-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateCustomerGateway "$@" ++exec ec2-cmd CreateCustomerGateway "$@" +--- a/bin/ec2-create-dhcp-options ++++ b/bin/ec2-create-dhcp-options +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateDhcpOptions "$@" ++exec ec2-cmd CreateDhcpOptions "$@" +--- a/bin/ec2-create-image ++++ b/bin/ec2-create-image +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateImage "$@" ++exec ec2-cmd CreateImage "$@" +--- a/bin/ec2-create-placement-group ++++ b/bin/ec2-create-placement-group +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreatePlacementGroup "$@" ++exec ec2-cmd CreatePlacementGroup "$@" +--- a/bin/ec2-create-snapshot ++++ b/bin/ec2-create-snapshot +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateSnapshot "$@" ++exec ec2-cmd CreateSnapshot "$@" +--- a/bin/ec2-create-spot-datafeed-subscription ++++ b/bin/ec2-create-spot-datafeed-subscription +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateSpotDatafeedSubscription "$@" ++exec ec2-cmd CreateSpotDatafeedSubscription "$@" +--- a/bin/ec2-create-subnet ++++ b/bin/ec2-create-subnet +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateSubnet "$@" ++exec ec2-cmd CreateSubnet "$@" +--- a/bin/ec2-create-volume ++++ b/bin/ec2-create-volume +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVolume "$@" ++exec ec2-cmd CreateVolume "$@" +--- a/bin/ec2-create-vpc ++++ b/bin/ec2-create-vpc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpc "$@" ++exec ec2-cmd CreateVpc "$@" +--- a/bin/ec2-create-vpn-connection ++++ b/bin/ec2-create-vpn-connection +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpnConnection "$@" ++exec ec2-cmd CreateVpnConnection "$@" +--- a/bin/ec2-create-vpn-gateway ++++ b/bin/ec2-create-vpn-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpnGateway "$@" ++exec ec2-cmd CreateVpnGateway "$@" +--- a/bin/ec2-deactivate-license ++++ b/bin/ec2-deactivate-license +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeactivateLicense "$@" ++exec ec2-cmd DeactivateLicense "$@" +--- a/bin/ec2-delete-customer-gateway ++++ b/bin/ec2-delete-customer-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteCustomerGateway "$@" ++exec ec2-cmd DeleteCustomerGateway "$@" +--- a/bin/ec2-delete-dhcp-options ++++ b/bin/ec2-delete-dhcp-options +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteDhcpOptions "$@" ++exec ec2-cmd DeleteDhcpOptions "$@" +--- a/bin/ec2-delete-group ++++ b/bin/ec2-delete-group +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteGroup "$@" ++exec ec2-cmd DeleteGroup "$@" +--- a/bin/ec2-delete-keypair ++++ b/bin/ec2-delete-keypair +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteKeyPair "$@" ++exec ec2-cmd DeleteKeyPair "$@" +--- a/bin/ec2-delete-placement-group ++++ b/bin/ec2-delete-placement-group +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeletePlacementGroup "$@" ++exec ec2-cmd DeletePlacementGroup "$@" +--- a/bin/ec2-delete-snapshot ++++ b/bin/ec2-delete-snapshot +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteSnapshot "$@" ++exec ec2-cmd DeleteSnapshot "$@" +--- a/bin/ec2-delete-spot-datafeed-subscription ++++ b/bin/ec2-delete-spot-datafeed-subscription +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@" ++exec ec2-cmd DeleteSpotDatafeedSubscription "$@" +--- a/bin/ec2-delete-subnet ++++ b/bin/ec2-delete-subnet +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteSubnet "$@" ++exec ec2-cmd DeleteSubnet "$@" +--- a/bin/ec2-delete-volume ++++ b/bin/ec2-delete-volume +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVolume "$@" ++exec ec2-cmd DeleteVolume "$@" +--- a/bin/ec2-delete-vpc ++++ b/bin/ec2-delete-vpc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpc "$@" ++exec ec2-cmd DeleteVpc "$@" +--- a/bin/ec2-delete-vpn-connection ++++ b/bin/ec2-delete-vpn-connection +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpnConnection "$@" ++exec ec2-cmd DeleteVpnConnection "$@" +--- a/bin/ec2-delete-vpn-gateway ++++ b/bin/ec2-delete-vpn-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpnGateway "$@" ++exec ec2-cmd DeleteVpnGateway "$@" +--- a/bin/ec2-deregister ++++ b/bin/ec2-deregister +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeregisterImage "$@" ++exec ec2-cmd DeregisterImage "$@" +--- a/bin/ec2-describe-addresses ++++ b/bin/ec2-describe-addresses +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeAddresses "$@" ++exec ec2-cmd DescribeAddresses "$@" +--- a/bin/ec2-describe-availability-zones ++++ b/bin/ec2-describe-availability-zones +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeAvailabilityZones "$@" ++exec ec2-cmd DescribeAvailabilityZones "$@" +--- a/bin/ec2-describe-bundle-tasks ++++ b/bin/ec2-describe-bundle-tasks +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeBundleTasks "$@" ++exec ec2-cmd DescribeBundleTasks "$@" +--- a/bin/ec2-describe-customer-gateways ++++ b/bin/ec2-describe-customer-gateways +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeCustomerGateways "$@" ++exec ec2-cmd DescribeCustomerGateways "$@" +--- a/bin/ec2-describe-dhcp-options ++++ b/bin/ec2-describe-dhcp-options +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeDhcpOptions "$@" ++exec ec2-cmd DescribeDhcpOptions "$@" +--- a/bin/ec2-describe-group ++++ b/bin/ec2-describe-group +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeGroups "$@" ++exec ec2-cmd DescribeGroups "$@" +--- a/bin/ec2-describe-image-attribute ++++ b/bin/ec2-describe-image-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeImageAttribute "$@" ++exec ec2-cmd DescribeImageAttribute "$@" +--- a/bin/ec2-describe-images ++++ b/bin/ec2-describe-images +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeImages "$@" ++exec ec2-cmd DescribeImages "$@" +--- a/bin/ec2-describe-instance-attribute ++++ b/bin/ec2-describe-instance-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstanceAttribute "$@" ++exec ec2-cmd DescribeInstanceAttribute "$@" +--- a/bin/ec2-describe-instances ++++ b/bin/ec2-describe-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstances "$@" ++exec ec2-cmd DescribeInstances "$@" +--- a/bin/ec2-describe-keypairs ++++ b/bin/ec2-describe-keypairs +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeKeyPairs "$@" ++exec ec2-cmd DescribeKeyPairs "$@" +--- a/bin/ec2-describe-licenses ++++ b/bin/ec2-describe-licenses +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeLicenses "$@" ++exec ec2-cmd DescribeLicenses "$@" +--- a/bin/ec2-describe-placement-groups ++++ b/bin/ec2-describe-placement-groups +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribePlacementGroups "$@" ++exec ec2-cmd DescribePlacementGroups "$@" +--- a/bin/ec2-describe-regions ++++ b/bin/ec2-describe-regions +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeRegions "$@" ++exec ec2-cmd DescribeRegions "$@" +--- a/bin/ec2-describe-reserved-instances ++++ b/bin/ec2-describe-reserved-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstances "$@" ++exec ec2-cmd DescribeReservedInstances "$@" +--- a/bin/ec2-describe-reserved-instances-offerings ++++ b/bin/ec2-describe-reserved-instances-offerings +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstancesOfferings "$@" ++exec ec2-cmd DescribeReservedInstancesOfferings "$@" +--- a/bin/ec2-describe-snapshot-attribute ++++ b/bin/ec2-describe-snapshot-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSnapshotAttribute "$@" ++exec ec2-cmd DescribeSnapshotAttribute "$@" +--- a/bin/ec2-describe-snapshots ++++ b/bin/ec2-describe-snapshots +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSnapshots "$@" ++exec ec2-cmd DescribeSnapshots "$@" +--- a/bin/ec2-describe-spot-datafeed-subscription ++++ b/bin/ec2-describe-spot-datafeed-subscription +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@" ++exec ec2-cmd DescribeSpotDatafeedSubscription "$@" +--- a/bin/ec2-describe-spot-instance-requests ++++ b/bin/ec2-describe-spot-instance-requests +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSpotInstanceRequests "$@" ++exec ec2-cmd DescribeSpotInstanceRequests "$@" +--- a/bin/ec2-describe-spot-price-history ++++ b/bin/ec2-describe-spot-price-history +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSpotPriceHistory "$@" ++exec ec2-cmd DescribeSpotPriceHistory "$@" +--- a/bin/ec2-describe-subnets ++++ b/bin/ec2-describe-subnets +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSubnets "$@" ++exec ec2-cmd DescribeSubnets "$@" +--- a/bin/ec2-describe-volumes ++++ b/bin/ec2-describe-volumes +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVolumes "$@" ++exec ec2-cmd DescribeVolumes "$@" +--- a/bin/ec2-describe-vpcs ++++ b/bin/ec2-describe-vpcs +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpcs "$@" ++exec ec2-cmd DescribeVpcs "$@" +--- a/bin/ec2-describe-vpn-connections ++++ b/bin/ec2-describe-vpn-connections +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpnConnections "$@" ++exec ec2-cmd DescribeVpnConnections "$@" +--- a/bin/ec2-describe-vpn-gateways ++++ b/bin/ec2-describe-vpn-gateways +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpnGateways "$@" ++exec ec2-cmd DescribeVpnGateways "$@" +--- a/bin/ec2-detach-volume ++++ b/bin/ec2-detach-volume +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachVolume "$@" ++exec ec2-cmd DetachVolume "$@" +--- a/bin/ec2-detach-vpn-gateway ++++ b/bin/ec2-detach-vpn-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachVpnGateway "$@" ++exec ec2-cmd DetachVpnGateway "$@" +--- a/bin/ec2-disassociate-address ++++ b/bin/ec2-disassociate-address +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DisassociateAddress "$@" ++exec ec2-cmd DisassociateAddress "$@" +--- a/bin/ec2-fingerprint-key ++++ b/bin/ec2-fingerprint-key +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd FingerprintKey "$@" ++exec ec2-cmd FingerprintKey "$@" +--- a/bin/ec2-get-console-output ++++ b/bin/ec2-get-console-output +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd GetConsoleOutput "$@" ++exec ec2-cmd GetConsoleOutput "$@" +--- a/bin/ec2-get-password ++++ b/bin/ec2-get-password +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd GetPassword "$@" ++exec ec2-cmd GetPassword "$@" +--- a/bin/ec2-migrate-image ++++ b/bin/ec2-migrate-image +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd MigrateBundle "$@" ++exec ec2-cmd MigrateBundle "$@" +--- a/bin/ec2-modify-image-attribute ++++ b/bin/ec2-modify-image-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyImageAttribute "$@" ++exec ec2-cmd ModifyImageAttribute "$@" +--- a/bin/ec2-modify-instance-attribute ++++ b/bin/ec2-modify-instance-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyInstanceAttribute "$@" ++exec ec2-cmd ModifyInstanceAttribute "$@" +--- a/bin/ec2-modify-snapshot-attribute ++++ b/bin/ec2-modify-snapshot-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifySnapshotAttribute "$@" ++exec ec2-cmd ModifySnapshotAttribute "$@" +--- a/bin/ec2-monitor-instances ++++ b/bin/ec2-monitor-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd MonitorInstances "$@" ++exec ec2-cmd MonitorInstances "$@" +--- a/bin/ec2-purchase-reserved-instances-offering ++++ b/bin/ec2-purchase-reserved-instances-offering +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd PurchaseReservedInstancesOffering "$@" ++exec ec2-cmd PurchaseReservedInstancesOffering "$@" +--- a/bin/ec2-reboot-instances ++++ b/bin/ec2-reboot-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RebootInstances "$@" ++exec ec2-cmd RebootInstances "$@" +--- a/bin/ec2-register ++++ b/bin/ec2-register +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RegisterImage "$@" ++exec ec2-cmd RegisterImage "$@" +--- a/bin/ec2-release-address ++++ b/bin/ec2-release-address +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReleaseAddress "$@" ++exec ec2-cmd ReleaseAddress "$@" +--- a/bin/ec2-request-spot-instances ++++ b/bin/ec2-request-spot-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RequestSpotInstances "$@" ++exec ec2-cmd RequestSpotInstances "$@" +--- a/bin/ec2-reset-image-attribute ++++ b/bin/ec2-reset-image-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetImageAttribute "$@" ++exec ec2-cmd ResetImageAttribute "$@" +--- a/bin/ec2-reset-instance-attribute ++++ b/bin/ec2-reset-instance-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetInstanceAttribute "$@" ++exec ec2-cmd ResetInstanceAttribute "$@" +--- a/bin/ec2-reset-snapshot-attribute ++++ b/bin/ec2-reset-snapshot-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetSnapshotAttribute "$@" ++exec ec2-cmd ResetSnapshotAttribute "$@" +--- a/bin/ec2-revoke ++++ b/bin/ec2-revoke +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RevokeGroup "$@" ++exec ec2-cmd RevokeGroup "$@" +--- a/bin/ec2-run-instances ++++ b/bin/ec2-run-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RunInstances "$@" ++exec ec2-cmd RunInstances "$@" +--- a/bin/ec2-start-instances ++++ b/bin/ec2-start-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd StartInstances "$@" ++exec ec2-cmd StartInstances "$@" +--- a/bin/ec2-stop-instances ++++ b/bin/ec2-stop-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd StopInstances "$@" ++exec ec2-cmd StopInstances "$@" +--- a/bin/ec2-terminate-instances ++++ b/bin/ec2-terminate-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd TerminateInstances "$@" ++exec ec2-cmd TerminateInstances "$@" +--- a/bin/ec2-unmonitor-instances ++++ b/bin/ec2-unmonitor-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd UnmonitorInstances "$@" ++exec ec2-cmd UnmonitorInstances "$@" +--- a/bin/ec2-version ++++ b/bin/ec2-version +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ShowVersion "$@" ++exec ec2-cmd ShowVersion "$@" +--- a/bin/ec2actlic ++++ b/bin/ec2actlic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ActivateLicense "$@" ++exec ec2-cmd ActivateLicense "$@" +--- a/bin/ec2addcgw ++++ b/bin/ec2addcgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateCustomerGateway "$@" ++exec ec2-cmd CreateCustomerGateway "$@" +--- a/bin/ec2adddopt ++++ b/bin/ec2adddopt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateDhcpOptions "$@" ++exec ec2-cmd CreateDhcpOptions "$@" +--- a/bin/ec2addgrp ++++ b/bin/ec2addgrp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AddGroup "$@" ++exec ec2-cmd AddGroup "$@" +--- a/bin/ec2addkey ++++ b/bin/ec2addkey +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateKeyPair "$@" ++exec ec2-cmd CreateKeyPair "$@" +--- a/bin/ec2addpgrp ++++ b/bin/ec2addpgrp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreatePlacementGroup "$@" ++exec ec2-cmd CreatePlacementGroup "$@" +--- a/bin/ec2addsds ++++ b/bin/ec2addsds +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateSpotDatafeedSubscription "$@" ++exec ec2-cmd CreateSpotDatafeedSubscription "$@" +--- a/bin/ec2addsnap ++++ b/bin/ec2addsnap +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateSnapshot "$@" ++exec ec2-cmd CreateSnapshot "$@" +--- a/bin/ec2addsubnet ++++ b/bin/ec2addsubnet +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateSubnet "$@" ++exec ec2-cmd CreateSubnet "$@" +--- a/bin/ec2addvgw ++++ b/bin/ec2addvgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpnGateway "$@" ++exec ec2-cmd CreateVpnGateway "$@" +--- a/bin/ec2addvol ++++ b/bin/ec2addvol +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVolume "$@" ++exec ec2-cmd CreateVolume "$@" +--- a/bin/ec2addvpc ++++ b/bin/ec2addvpc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpc "$@" ++exec ec2-cmd CreateVpc "$@" +--- a/bin/ec2addvpn ++++ b/bin/ec2addvpn +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpnConnection "$@" ++exec ec2-cmd CreateVpnConnection "$@" +--- a/bin/ec2allocaddr ++++ b/bin/ec2allocaddr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AllocateAddress "$@" ++exec ec2-cmd AllocateAddress "$@" +--- a/bin/ec2assocaddr ++++ b/bin/ec2assocaddr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssociateAddress "$@" ++exec ec2-cmd AssociateAddress "$@" +--- a/bin/ec2assocdopt ++++ b/bin/ec2assocdopt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssociateDhcpOptions "$@" ++exec ec2-cmd AssociateDhcpOptions "$@" +--- a/bin/ec2attvgw ++++ b/bin/ec2attvgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachVpnGateway "$@" ++exec ec2-cmd AttachVpnGateway "$@" +--- a/bin/ec2attvol ++++ b/bin/ec2attvol +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachVolume "$@" ++exec ec2-cmd AttachVolume "$@" +--- a/bin/ec2auth ++++ b/bin/ec2auth +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AuthorizeGroup "$@" ++exec ec2-cmd AuthorizeGroup "$@" +--- a/bin/ec2bundle ++++ b/bin/ec2bundle +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd BundleInstance "$@" ++exec ec2-cmd BundleInstance "$@" +--- a/bin/ec2cbun ++++ b/bin/ec2cbun +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelBundleTask "$@" ++exec ec2-cmd CancelBundleTask "$@" +--- a/bin/ec2cim ++++ b/bin/ec2cim +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateImage "$@" ++exec ec2-cmd CreateImage "$@" +--- a/bin/ec2cpi ++++ b/bin/ec2cpi +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ConfirmProductInstance "$@" ++exec ec2-cmd ConfirmProductInstance "$@" +--- a/bin/ec2csir ++++ b/bin/ec2csir +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelSpotInstanceRequests "$@" ++exec ec2-cmd CancelSpotInstanceRequests "$@" +--- a/bin/ec2daddr ++++ b/bin/ec2daddr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeAddresses "$@" ++exec ec2-cmd DescribeAddresses "$@" +--- a/bin/ec2datt ++++ b/bin/ec2datt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeImageAttribute "$@" ++exec ec2-cmd DescribeImageAttribute "$@" +--- a/bin/ec2daz ++++ b/bin/ec2daz +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeAvailabilityZones "$@" ++exec ec2-cmd DescribeAvailabilityZones "$@" +--- a/bin/ec2dbun ++++ b/bin/ec2dbun +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeBundleTasks "$@" ++exec ec2-cmd DescribeBundleTasks "$@" +--- a/bin/ec2dcgw ++++ b/bin/ec2dcgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeCustomerGateways "$@" ++exec ec2-cmd DescribeCustomerGateways "$@" +--- a/bin/ec2ddopt ++++ b/bin/ec2ddopt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeDhcpOptions "$@" ++exec ec2-cmd DescribeDhcpOptions "$@" +--- a/bin/ec2deactlic ++++ b/bin/ec2deactlic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeactivateLicense "$@" ++exec ec2-cmd DeactivateLicense "$@" +--- a/bin/ec2delcgw ++++ b/bin/ec2delcgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteCustomerGateway "$@" ++exec ec2-cmd DeleteCustomerGateway "$@" +--- a/bin/ec2deldopt ++++ b/bin/ec2deldopt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteDhcpOptions "$@" ++exec ec2-cmd DeleteDhcpOptions "$@" +--- a/bin/ec2delgrp ++++ b/bin/ec2delgrp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteGroup "$@" ++exec ec2-cmd DeleteGroup "$@" +--- a/bin/ec2delkey ++++ b/bin/ec2delkey +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteKeyPair "$@" ++exec ec2-cmd DeleteKeyPair "$@" +--- a/bin/ec2delpgrp ++++ b/bin/ec2delpgrp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeletePlacementGroup "$@" ++exec ec2-cmd DeletePlacementGroup "$@" +--- a/bin/ec2delsds ++++ b/bin/ec2delsds +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@" ++exec ec2-cmd DeleteSpotDatafeedSubscription "$@" +--- a/bin/ec2delsnap ++++ b/bin/ec2delsnap +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteSnapshot "$@" ++exec ec2-cmd DeleteSnapshot "$@" +--- a/bin/ec2delsubnet ++++ b/bin/ec2delsubnet +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteSubnet "$@" ++exec ec2-cmd DeleteSubnet "$@" +--- a/bin/ec2delvgw ++++ b/bin/ec2delvgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpnGateway "$@" ++exec ec2-cmd DeleteVpnGateway "$@" +--- a/bin/ec2delvol ++++ b/bin/ec2delvol +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVolume "$@" ++exec ec2-cmd DeleteVolume "$@" +--- a/bin/ec2delvpc ++++ b/bin/ec2delvpc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpc "$@" ++exec ec2-cmd DeleteVpc "$@" +--- a/bin/ec2delvpn ++++ b/bin/ec2delvpn +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpnConnection "$@" ++exec ec2-cmd DeleteVpnConnection "$@" +--- a/bin/ec2dereg ++++ b/bin/ec2dereg +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeregisterImage "$@" ++exec ec2-cmd DeregisterImage "$@" +--- a/bin/ec2detvgw ++++ b/bin/ec2detvgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachVpnGateway "$@" ++exec ec2-cmd DetachVpnGateway "$@" +--- a/bin/ec2detvol ++++ b/bin/ec2detvol +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachVolume "$@" ++exec ec2-cmd DetachVolume "$@" +--- a/bin/ec2dgrp ++++ b/bin/ec2dgrp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeGroups "$@" ++exec ec2-cmd DescribeGroups "$@" +--- a/bin/ec2diatt ++++ b/bin/ec2diatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstanceAttribute "$@" ++exec ec2-cmd DescribeInstanceAttribute "$@" +--- a/bin/ec2dim ++++ b/bin/ec2dim +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeImages "$@" ++exec ec2-cmd DescribeImages "$@" +--- a/bin/ec2dimatt ++++ b/bin/ec2dimatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeImageAttribute "$@" ++exec ec2-cmd DescribeImageAttribute "$@" +--- a/bin/ec2din ++++ b/bin/ec2din +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstances "$@" ++exec ec2-cmd DescribeInstances "$@" +--- a/bin/ec2dinatt ++++ b/bin/ec2dinatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstanceAttribute "$@" ++exec ec2-cmd DescribeInstanceAttribute "$@" +--- a/bin/ec2disaddr ++++ b/bin/ec2disaddr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DisassociateAddress "$@" ++exec ec2-cmd DisassociateAddress "$@" +--- a/bin/ec2dkey ++++ b/bin/ec2dkey +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeKeyPairs "$@" ++exec ec2-cmd DescribeKeyPairs "$@" +--- a/bin/ec2dlic ++++ b/bin/ec2dlic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeLicenses "$@" ++exec ec2-cmd DescribeLicenses "$@" +--- a/bin/ec2dpgrp ++++ b/bin/ec2dpgrp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribePlacementGroups "$@" ++exec ec2-cmd DescribePlacementGroups "$@" +--- a/bin/ec2dre ++++ b/bin/ec2dre +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeRegions "$@" ++exec ec2-cmd DescribeRegions "$@" +--- a/bin/ec2dri ++++ b/bin/ec2dri +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstances "$@" ++exec ec2-cmd DescribeReservedInstances "$@" +--- a/bin/ec2drio ++++ b/bin/ec2drio +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstancesOfferings "$@" ++exec ec2-cmd DescribeReservedInstancesOfferings "$@" +--- a/bin/ec2dsds ++++ b/bin/ec2dsds +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@" ++exec ec2-cmd DescribeSpotDatafeedSubscription "$@" +--- a/bin/ec2dsir ++++ b/bin/ec2dsir +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSpotInstanceRequests "$@" ++exec ec2-cmd DescribeSpotInstanceRequests "$@" +--- a/bin/ec2dsnap ++++ b/bin/ec2dsnap +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSnapshots "$@" ++exec ec2-cmd DescribeSnapshots "$@" +--- a/bin/ec2dsnapatt ++++ b/bin/ec2dsnapatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSnapshotAttribute "$@" ++exec ec2-cmd DescribeSnapshotAttribute "$@" +--- a/bin/ec2dsph ++++ b/bin/ec2dsph +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSpotPriceHistory "$@" ++exec ec2-cmd DescribeSpotPriceHistory "$@" +--- a/bin/ec2dsubnet ++++ b/bin/ec2dsubnet +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeSubnets "$@" ++exec ec2-cmd DescribeSubnets "$@" +--- a/bin/ec2dvgw ++++ b/bin/ec2dvgw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpnGateways "$@" ++exec ec2-cmd DescribeVpnGateways "$@" +--- a/bin/ec2dvol ++++ b/bin/ec2dvol +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVolumes "$@" ++exec ec2-cmd DescribeVolumes "$@" +--- a/bin/ec2dvpc ++++ b/bin/ec2dvpc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpcs "$@" ++exec ec2-cmd DescribeVpcs "$@" +--- a/bin/ec2dvpn ++++ b/bin/ec2dvpn +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpnConnections "$@" ++exec ec2-cmd DescribeVpnConnections "$@" +--- a/bin/ec2fp ++++ b/bin/ec2fp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd FingerprintKey "$@" ++exec ec2-cmd FingerprintKey "$@" +--- a/bin/ec2gcons ++++ b/bin/ec2gcons +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd GetConsoleOutput "$@" ++exec ec2-cmd GetConsoleOutput "$@" +--- a/bin/ec2gpass ++++ b/bin/ec2gpass +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd GetPassword "$@" ++exec ec2-cmd GetPassword "$@" +--- a/bin/ec2kill ++++ b/bin/ec2kill +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd TerminateInstances "$@" ++exec ec2-cmd TerminateInstances "$@" +--- a/bin/ec2matt ++++ b/bin/ec2matt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyImageAttribute "$@" ++exec ec2-cmd ModifyImageAttribute "$@" +--- a/bin/ec2miatt ++++ b/bin/ec2miatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyInstanceAttribute "$@" ++exec ec2-cmd ModifyInstanceAttribute "$@" +--- a/bin/ec2mim ++++ b/bin/ec2mim +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd MigrateBundle "$@" ++exec ec2-cmd MigrateBundle "$@" +--- a/bin/ec2mimatt ++++ b/bin/ec2mimatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyImageAttribute "$@" ++exec ec2-cmd ModifyImageAttribute "$@" +--- a/bin/ec2min ++++ b/bin/ec2min +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd MonitorInstances "$@" ++exec ec2-cmd MonitorInstances "$@" +--- a/bin/ec2minatt ++++ b/bin/ec2minatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyInstanceAttribute "$@" ++exec ec2-cmd ModifyInstanceAttribute "$@" +--- a/bin/ec2msnapatt ++++ b/bin/ec2msnapatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifySnapshotAttribute "$@" ++exec ec2-cmd ModifySnapshotAttribute "$@" +--- a/bin/ec2prio ++++ b/bin/ec2prio +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd PurchaseReservedInstancesOffering "$@" ++exec ec2-cmd PurchaseReservedInstancesOffering "$@" +--- a/bin/ec2ratt ++++ b/bin/ec2ratt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetImageAttribute "$@" ++exec ec2-cmd ResetImageAttribute "$@" +--- a/bin/ec2reboot ++++ b/bin/ec2reboot +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RebootInstances "$@" ++exec ec2-cmd RebootInstances "$@" +--- a/bin/ec2reg ++++ b/bin/ec2reg +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RegisterImage "$@" ++exec ec2-cmd RegisterImage "$@" +--- a/bin/ec2reladdr ++++ b/bin/ec2reladdr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReleaseAddress "$@" ++exec ec2-cmd ReleaseAddress "$@" +--- a/bin/ec2revoke ++++ b/bin/ec2revoke +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RevokeGroup "$@" ++exec ec2-cmd RevokeGroup "$@" +--- a/bin/ec2riatt ++++ b/bin/ec2riatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetInstanceAttribute "$@" ++exec ec2-cmd ResetInstanceAttribute "$@" +--- a/bin/ec2rimatt ++++ b/bin/ec2rimatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetImageAttribute "$@" ++exec ec2-cmd ResetImageAttribute "$@" +--- a/bin/ec2rinatt ++++ b/bin/ec2rinatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetInstanceAttribute "$@" ++exec ec2-cmd ResetInstanceAttribute "$@" +--- a/bin/ec2rsi ++++ b/bin/ec2rsi +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RequestSpotInstances "$@" ++exec ec2-cmd RequestSpotInstances "$@" +--- a/bin/ec2rsnapatt ++++ b/bin/ec2rsnapatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetSnapshotAttribute "$@" ++exec ec2-cmd ResetSnapshotAttribute "$@" +--- a/bin/ec2run ++++ b/bin/ec2run +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd RunInstances "$@" ++exec ec2-cmd RunInstances "$@" +--- a/bin/ec2start ++++ b/bin/ec2start +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd StartInstances "$@" ++exec ec2-cmd StartInstances "$@" +--- a/bin/ec2stop ++++ b/bin/ec2stop +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd StopInstances "$@" ++exec ec2-cmd StopInstances "$@" +--- a/bin/ec2umin ++++ b/bin/ec2umin +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd UnmonitorInstances "$@" ++exec ec2-cmd UnmonitorInstances "$@" +--- a/bin/ec2ver ++++ b/bin/ec2ver +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ShowVersion "$@" ++exec ec2-cmd ShowVersion "$@" +--- a/bin/ec2-create-tags ++++ b/bin/ec2-create-tags +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateTags "$@" ++exec ec2-cmd CreateTags "$@" +--- a/bin/ec2-delete-tags ++++ b/bin/ec2-delete-tags +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteTags "$@" ++exec ec2-cmd DeleteTags "$@" +--- a/bin/ec2-describe-tags ++++ b/bin/ec2-describe-tags +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeTags "$@" ++exec ec2-cmd DescribeTags "$@" +--- a/bin/ec2-import-keypair ++++ b/bin/ec2-import-keypair +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportKeyPair "$@" ++exec ec2-cmd ImportKeyPair "$@" +--- a/bin/ec2addtag ++++ b/bin/ec2addtag +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateTags "$@" ++exec ec2-cmd CreateTags "$@" +--- a/bin/ec2deltag ++++ b/bin/ec2deltag +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteTags "$@" ++exec ec2-cmd DeleteTags "$@" +--- a/bin/ec2dtag ++++ b/bin/ec2dtag +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeTags "$@" ++exec ec2-cmd DescribeTags "$@" +--- a/bin/ec2ikey ++++ b/bin/ec2ikey +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportKeyPair "$@" ++exec ec2-cmd ImportKeyPair "$@" +--- a/bin/ec2tag ++++ b/bin/ec2tag +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateTags "$@" ++exec ec2-cmd CreateTags "$@" +--- a/bin/ec2-associate-route-table ++++ b/bin/ec2-associate-route-table +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssociateRouteTable "$@" ++exec ec2-cmd AssociateRouteTable "$@" +--- a/bin/ec2-attach-internet-gateway ++++ b/bin/ec2-attach-internet-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachInternetGateway "$@" ++exec ec2-cmd AttachInternetGateway "$@" +--- a/bin/ec2-cancel-conversion-task ++++ b/bin/ec2-cancel-conversion-task +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelConversionTask "$@" ++exec ec2-cmd CancelConversionTask "$@" +--- a/bin/ec2-create-group ++++ b/bin/ec2-create-group +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AddGroup "$@" ++exec ec2-cmd AddGroup "$@" +--- a/bin/ec2-create-internet-gateway ++++ b/bin/ec2-create-internet-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateInternetGateway "$@" ++exec ec2-cmd CreateInternetGateway "$@" +--- a/bin/ec2-create-keypair ++++ b/bin/ec2-create-keypair +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateKeyPair "$@" ++exec ec2-cmd CreateKeyPair "$@" +--- a/bin/ec2-create-network-acl ++++ b/bin/ec2-create-network-acl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateNetworkAcl "$@" ++exec ec2-cmd CreateNetworkAcl "$@" +--- a/bin/ec2-create-network-acl-entry ++++ b/bin/ec2-create-network-acl-entry +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateNetworkAclEntry "$@" ++exec ec2-cmd CreateNetworkAclEntry "$@" +--- a/bin/ec2-create-route ++++ b/bin/ec2-create-route +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateRoute "$@" ++exec ec2-cmd CreateRoute "$@" +--- a/bin/ec2-create-route-table ++++ b/bin/ec2-create-route-table +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateRouteTable "$@" ++exec ec2-cmd CreateRouteTable "$@" +--- a/bin/ec2-delete-disk-image ++++ b/bin/ec2-delete-disk-image +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteDiskImage "$@" ++exec ec2-cmd DeleteDiskImage "$@" +--- a/bin/ec2-delete-internet-gateway ++++ b/bin/ec2-delete-internet-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteInternetGateway "$@" ++exec ec2-cmd DeleteInternetGateway "$@" +--- a/bin/ec2-delete-network-acl ++++ b/bin/ec2-delete-network-acl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteNetworkAcl "$@" ++exec ec2-cmd DeleteNetworkAcl "$@" +--- a/bin/ec2-delete-network-acl-entry ++++ b/bin/ec2-delete-network-acl-entry +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteNetworkAclEntry "$@" ++exec ec2-cmd DeleteNetworkAclEntry "$@" +--- a/bin/ec2-delete-route ++++ b/bin/ec2-delete-route +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteRoute "$@" ++exec ec2-cmd DeleteRoute "$@" +--- a/bin/ec2-delete-route-table ++++ b/bin/ec2-delete-route-table +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteRouteTable "$@" ++exec ec2-cmd DeleteRouteTable "$@" +--- a/bin/ec2-describe-conversion-tasks ++++ b/bin/ec2-describe-conversion-tasks +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeConversionTasks "$@" ++exec ec2-cmd DescribeConversionTasks "$@" +--- a/bin/ec2-describe-internet-gateways ++++ b/bin/ec2-describe-internet-gateways +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInternetGateways "$@" ++exec ec2-cmd DescribeInternetGateways "$@" +--- a/bin/ec2-describe-network-acls ++++ b/bin/ec2-describe-network-acls +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeNetworkAcls "$@" ++exec ec2-cmd DescribeNetworkAcls "$@" +--- a/bin/ec2-describe-route-tables ++++ b/bin/ec2-describe-route-tables +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeRouteTables "$@" ++exec ec2-cmd DescribeRouteTables "$@" +--- a/bin/ec2-detach-internet-gateway ++++ b/bin/ec2-detach-internet-gateway +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachInternetGateway "$@" ++exec ec2-cmd DetachInternetGateway "$@" +--- a/bin/ec2-disassociate-route-table ++++ b/bin/ec2-disassociate-route-table +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DisassociateRouteTable "$@" ++exec ec2-cmd DisassociateRouteTable "$@" +--- a/bin/ec2-import-instance ++++ b/bin/ec2-import-instance +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportInstance "$@" ++exec ec2-cmd ImportInstance "$@" +--- a/bin/ec2-import-volume ++++ b/bin/ec2-import-volume +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportVolume "$@" ++exec ec2-cmd ImportVolume "$@" +--- a/bin/ec2-replace-network-acl-association ++++ b/bin/ec2-replace-network-acl-association +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceNetworkAclAssociation "$@" ++exec ec2-cmd ReplaceNetworkAclAssociation "$@" +--- a/bin/ec2-replace-network-acl-entry ++++ b/bin/ec2-replace-network-acl-entry +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceNetworkAclEntry "$@" ++exec ec2-cmd ReplaceNetworkAclEntry "$@" +--- a/bin/ec2-replace-route ++++ b/bin/ec2-replace-route +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceRoute "$@" ++exec ec2-cmd ReplaceRoute "$@" +--- a/bin/ec2-replace-route-table-association ++++ b/bin/ec2-replace-route-table-association +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceRouteTableAssociation "$@" ++exec ec2-cmd ReplaceRouteTableAssociation "$@" +--- a/bin/ec2-upload-disk-image ++++ b/bin/ec2-upload-disk-image +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd UploadDiskImage "$@" ++exec ec2-cmd UploadDiskImage "$@" +--- a/bin/ec2addigw ++++ b/bin/ec2addigw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateInternetGateway "$@" ++exec ec2-cmd CreateInternetGateway "$@" +--- a/bin/ec2addnacl ++++ b/bin/ec2addnacl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateNetworkAcl "$@" ++exec ec2-cmd CreateNetworkAcl "$@" +--- a/bin/ec2addnae ++++ b/bin/ec2addnae +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateNetworkAclEntry "$@" ++exec ec2-cmd CreateNetworkAclEntry "$@" +--- a/bin/ec2addrt ++++ b/bin/ec2addrt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateRoute "$@" ++exec ec2-cmd CreateRoute "$@" +--- a/bin/ec2addrtb ++++ b/bin/ec2addrtb +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateRouteTable "$@" ++exec ec2-cmd CreateRouteTable "$@" +--- a/bin/ec2assocrtb ++++ b/bin/ec2assocrtb +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssociateRouteTable "$@" ++exec ec2-cmd AssociateRouteTable "$@" +--- a/bin/ec2attigw ++++ b/bin/ec2attigw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachInternetGateway "$@" ++exec ec2-cmd AttachInternetGateway "$@" +--- a/bin/ec2cct ++++ b/bin/ec2cct +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelConversionTask "$@" ++exec ec2-cmd CancelConversionTask "$@" +--- a/bin/ec2dct ++++ b/bin/ec2dct +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeConversionTasks "$@" ++exec ec2-cmd DescribeConversionTasks "$@" +--- a/bin/ec2ddi ++++ b/bin/ec2ddi +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteDiskImage "$@" ++exec ec2-cmd DeleteDiskImage "$@" +--- a/bin/ec2deligw ++++ b/bin/ec2deligw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteInternetGateway "$@" ++exec ec2-cmd DeleteInternetGateway "$@" +--- a/bin/ec2delnacl ++++ b/bin/ec2delnacl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteNetworkAcl "$@" ++exec ec2-cmd DeleteNetworkAcl "$@" +--- a/bin/ec2delnae ++++ b/bin/ec2delnae +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteNetworkAclEntry "$@" ++exec ec2-cmd DeleteNetworkAclEntry "$@" +--- a/bin/ec2delrt ++++ b/bin/ec2delrt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteRoute "$@" ++exec ec2-cmd DeleteRoute "$@" +--- a/bin/ec2delrtb ++++ b/bin/ec2delrtb +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteRouteTable "$@" ++exec ec2-cmd DeleteRouteTable "$@" +--- a/bin/ec2detigw ++++ b/bin/ec2detigw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachInternetGateway "$@" ++exec ec2-cmd DetachInternetGateway "$@" +--- a/bin/ec2digw ++++ b/bin/ec2digw +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInternetGateways "$@" ++exec ec2-cmd DescribeInternetGateways "$@" +--- a/bin/ec2disrtb ++++ b/bin/ec2disrtb +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DisassociateRouteTable "$@" ++exec ec2-cmd DisassociateRouteTable "$@" +--- a/bin/ec2dnacl ++++ b/bin/ec2dnacl +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeNetworkAcls "$@" ++exec ec2-cmd DescribeNetworkAcls "$@" +--- a/bin/ec2drtb ++++ b/bin/ec2drtb +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeRouteTables "$@" ++exec ec2-cmd DescribeRouteTables "$@" +--- a/bin/ec2ii ++++ b/bin/ec2ii +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportInstance "$@" ++exec ec2-cmd ImportInstance "$@" +--- a/bin/ec2iin ++++ b/bin/ec2iin +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportInstance "$@" ++exec ec2-cmd ImportInstance "$@" +--- a/bin/ec2iv ++++ b/bin/ec2iv +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportVolume "$@" ++exec ec2-cmd ImportVolume "$@" +--- a/bin/ec2ivol ++++ b/bin/ec2ivol +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ImportVolume "$@" ++exec ec2-cmd ImportVolume "$@" +--- a/bin/ec2repnaclassoc ++++ b/bin/ec2repnaclassoc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceNetworkAclAssociation "$@" ++exec ec2-cmd ReplaceNetworkAclAssociation "$@" +--- a/bin/ec2repnae ++++ b/bin/ec2repnae +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceNetworkAclEntry "$@" ++exec ec2-cmd ReplaceNetworkAclEntry "$@" +--- a/bin/ec2reprt ++++ b/bin/ec2reprt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceRoute "$@" ++exec ec2-cmd ReplaceRoute "$@" +--- a/bin/ec2reprtbassoc ++++ b/bin/ec2reprtbassoc +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReplaceRouteTableAssociation "$@" ++exec ec2-cmd ReplaceRouteTableAssociation "$@" +--- a/bin/ec2udi ++++ b/bin/ec2udi +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd UploadDiskImage "$@" ++exec ec2-cmd UploadDiskImage "$@" +--- a/bin/ec2-describe-instance-status ++++ b/bin/ec2-describe-instance-status +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstanceStatus "$@" ++exec ec2-cmd DescribeInstanceStatus "$@" +--- a/bin/ec2-resume-import ++++ b/bin/ec2-resume-import +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResumeImport "$@" ++exec ec2-cmd ResumeImport "$@" +--- a/bin/ec2dins ++++ b/bin/ec2dins +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeInstanceStatus "$@" ++exec ec2-cmd DescribeInstanceStatus "$@" +--- a/bin/ec2rim ++++ b/bin/ec2rim +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResumeImport "$@" ++exec ec2-cmd ResumeImport "$@" +--- a/bin/ec2-assign-private-ip-addresses ++++ b/bin/ec2-assign-private-ip-addresses +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssignPrivateIPAddresses "$@" ++exec ec2-cmd AssignPrivateIPAddresses "$@" +--- a/bin/ec2-attach-network-interface ++++ b/bin/ec2-attach-network-interface +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachNetworkInterface "$@" ++exec ec2-cmd AttachNetworkInterface "$@" +--- a/bin/ec2-cancel-export-task ++++ b/bin/ec2-cancel-export-task +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelExportTask "$@" ++exec ec2-cmd CancelExportTask "$@" +--- a/bin/ec2-create-instance-export-task ++++ b/bin/ec2-create-instance-export-task +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateInstanceExportTask "$@" ++exec ec2-cmd CreateInstanceExportTask "$@" +--- a/bin/ec2-create-network-interface ++++ b/bin/ec2-create-network-interface +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateNetworkInterface "$@" ++exec ec2-cmd CreateNetworkInterface "$@" +--- a/bin/ec2-delete-network-interface ++++ b/bin/ec2-delete-network-interface +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteNetworkInterface "$@" ++exec ec2-cmd DeleteNetworkInterface "$@" +--- a/bin/ec2-describe-export-tasks ++++ b/bin/ec2-describe-export-tasks +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeExportTasks "$@" ++exec ec2-cmd DescribeExportTasks "$@" +--- a/bin/ec2-describe-network-interface-attribute ++++ b/bin/ec2-describe-network-interface-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeNetworkInterfaceAttribute "$@" ++exec ec2-cmd DescribeNetworkInterfaceAttribute "$@" +--- a/bin/ec2-describe-network-interfaces ++++ b/bin/ec2-describe-network-interfaces +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeNetworkInterfaces "$@" ++exec ec2-cmd DescribeNetworkInterfaces "$@" +--- a/bin/ec2-describe-volume-attribute ++++ b/bin/ec2-describe-volume-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVolumeAttribute "$@" ++exec ec2-cmd DescribeVolumeAttribute "$@" +--- a/bin/ec2-describe-volume-status ++++ b/bin/ec2-describe-volume-status +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVolumeStatus "$@" ++exec ec2-cmd DescribeVolumeStatus "$@" +--- a/bin/ec2-detach-network-interface ++++ b/bin/ec2-detach-network-interface +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachNetworkInterface "$@" ++exec ec2-cmd DetachNetworkInterface "$@" +--- a/bin/ec2-enable-volume-io ++++ b/bin/ec2-enable-volume-io +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd EnableVolumeIO "$@" ++exec ec2-cmd EnableVolumeIO "$@" +--- a/bin/ec2-modify-network-interface-attribute ++++ b/bin/ec2-modify-network-interface-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyNetworkInterfaceAttribute "$@" ++exec ec2-cmd ModifyNetworkInterfaceAttribute "$@" +--- a/bin/ec2-modify-volume-attribute ++++ b/bin/ec2-modify-volume-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyVolumeAttribute "$@" ++exec ec2-cmd ModifyVolumeAttribute "$@" +--- a/bin/ec2-report-instance-status ++++ b/bin/ec2-report-instance-status +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReportInstanceStatus "$@" ++exec ec2-cmd ReportInstanceStatus "$@" +--- a/bin/ec2-reset-network-interface-attribute ++++ b/bin/ec2-reset-network-interface-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetNetworkInterfaceAttribute "$@" ++exec ec2-cmd ResetNetworkInterfaceAttribute "$@" +--- a/bin/ec2-unassign-private-ip-addresses ++++ b/bin/ec2-unassign-private-ip-addresses +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd UnassignPrivateIPAddresses "$@" ++exec ec2-cmd UnassignPrivateIPAddresses "$@" +--- a/bin/ec2addixt ++++ b/bin/ec2addixt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateInstanceExportTask "$@" ++exec ec2-cmd CreateInstanceExportTask "$@" +--- a/bin/ec2addnic ++++ b/bin/ec2addnic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateNetworkInterface "$@" ++exec ec2-cmd CreateNetworkInterface "$@" +--- a/bin/ec2apip ++++ b/bin/ec2apip +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AssignPrivateIPAddresses "$@" ++exec ec2-cmd AssignPrivateIPAddresses "$@" +--- a/bin/ec2attnic ++++ b/bin/ec2attnic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd AttachNetworkInterface "$@" ++exec ec2-cmd AttachNetworkInterface "$@" +--- a/bin/ec2cxt ++++ b/bin/ec2cxt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelExportTask "$@" ++exec ec2-cmd CancelExportTask "$@" +--- a/bin/ec2delnic ++++ b/bin/ec2delnic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteNetworkInterface "$@" ++exec ec2-cmd DeleteNetworkInterface "$@" +--- a/bin/ec2detnic ++++ b/bin/ec2detnic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DetachNetworkInterface "$@" ++exec ec2-cmd DetachNetworkInterface "$@" +--- a/bin/ec2dnic ++++ b/bin/ec2dnic +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeNetworkInterfaces "$@" ++exec ec2-cmd DescribeNetworkInterfaces "$@" +--- a/bin/ec2dnicatt ++++ b/bin/ec2dnicatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeNetworkInterfaceAttribute "$@" ++exec ec2-cmd DescribeNetworkInterfaceAttribute "$@" +--- a/bin/ec2dvolatt ++++ b/bin/ec2dvolatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVolumeAttribute "$@" ++exec ec2-cmd DescribeVolumeAttribute "$@" +--- a/bin/ec2dvs ++++ b/bin/ec2dvs +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVolumeStatus "$@" ++exec ec2-cmd DescribeVolumeStatus "$@" +--- a/bin/ec2dxt ++++ b/bin/ec2dxt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeExportTasks "$@" ++exec ec2-cmd DescribeExportTasks "$@" +--- a/bin/ec2evio ++++ b/bin/ec2evio +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd EnableVolumeIO "$@" ++exec ec2-cmd EnableVolumeIO "$@" +--- a/bin/ec2mnicatt ++++ b/bin/ec2mnicatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyNetworkInterfaceAttribute "$@" ++exec ec2-cmd ModifyNetworkInterfaceAttribute "$@" +--- a/bin/ec2mvolatt ++++ b/bin/ec2mvolatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyVolumeAttribute "$@" ++exec ec2-cmd ModifyVolumeAttribute "$@" +--- a/bin/ec2rep ++++ b/bin/ec2rep +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ReportInstanceStatus "$@" ++exec ec2-cmd ReportInstanceStatus "$@" +--- a/bin/ec2rnicatt ++++ b/bin/ec2rnicatt +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ResetNetworkInterfaceAttribute "$@" ++exec ec2-cmd ResetNetworkInterfaceAttribute "$@" +--- a/bin/ec2upip ++++ b/bin/ec2upip +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd UnassignPrivateIPAddresses "$@" ++exec ec2-cmd UnassignPrivateIPAddresses "$@" +--- a/bin/ec2-cancel-reserved-instances-listing ++++ b/bin/ec2-cancel-reserved-instances-listing +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelReservedInstancesListing "$@" ++exec ec2-cmd CancelReservedInstancesListing "$@" +--- a/bin/ec2-create-reserved-instances-listing ++++ b/bin/ec2-create-reserved-instances-listing +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateReservedInstancesListing "$@" ++exec ec2-cmd CreateReservedInstancesListing "$@" +--- a/bin/ec2-create-vpn-connection-route ++++ b/bin/ec2-create-vpn-connection-route +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpnConnectionRoute "$@" ++exec ec2-cmd CreateVpnConnectionRoute "$@" +--- a/bin/ec2-delete-vpn-connection-route ++++ b/bin/ec2-delete-vpn-connection-route +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpnConnectionRoute "$@" ++exec ec2-cmd DeleteVpnConnectionRoute "$@" +--- a/bin/ec2-describe-reserved-instances-listings ++++ b/bin/ec2-describe-reserved-instances-listings +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstancesListings "$@" ++exec ec2-cmd DescribeReservedInstancesListings "$@" +--- a/bin/ec2-disable-vgw-route-propagation ++++ b/bin/ec2-disable-vgw-route-propagation +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DisableVgwRoutePropagation "$@" ++exec ec2-cmd DisableVgwRoutePropagation "$@" +--- a/bin/ec2-enable-vgw-route-propagation ++++ b/bin/ec2-enable-vgw-route-propagation +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd EnableVgwRoutePropagation "$@" ++exec ec2-cmd EnableVgwRoutePropagation "$@" +--- a/bin/ec2caril ++++ b/bin/ec2caril +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CancelReservedInstancesListing "$@" ++exec ec2-cmd CancelReservedInstancesListing "$@" +--- a/bin/ec2crril ++++ b/bin/ec2crril +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateReservedInstancesListing "$@" ++exec ec2-cmd CreateReservedInstancesListing "$@" +--- a/bin/ec2cvcr ++++ b/bin/ec2cvcr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CreateVpnConnectionRoute "$@" ++exec ec2-cmd CreateVpnConnectionRoute "$@" +--- a/bin/ec2dril ++++ b/bin/ec2dril +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstancesListings "$@" ++exec ec2-cmd DescribeReservedInstancesListings "$@" +--- a/bin/ec2drp ++++ b/bin/ec2drp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DisableVgwRoutePropagation "$@" ++exec ec2-cmd DisableVgwRoutePropagation "$@" +--- a/bin/ec2dvcr ++++ b/bin/ec2dvcr +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DeleteVpnConnectionRoute "$@" ++exec ec2-cmd DeleteVpnConnectionRoute "$@" +--- a/bin/ec2erp ++++ b/bin/ec2erp +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd EnableVgwRoutePropagation "$@" ++exec ec2-cmd EnableVgwRoutePropagation "$@" +--- a/bin/ec2-copy-snapshot ++++ b/bin/ec2-copy-snapshot +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CopySnapshot "$@" ++exec ec2-cmd CopySnapshot "$@" +--- a/bin/ec2cpsnap ++++ b/bin/ec2cpsnap +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CopySnapshot "$@" ++exec ec2-cmd CopySnapshot "$@" +--- a/bin/ec2-copy-image ++++ b/bin/ec2-copy-image +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CopyImage "$@" ++exec ec2-cmd CopyImage "$@" +--- a/bin/ec2-describe-account-attributes ++++ b/bin/ec2-describe-account-attributes +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeAccountAttributes "$@" ++exec ec2-cmd DescribeAccountAttributes "$@" +--- a/bin/ec2-describe-reserved-instances-modifications ++++ b/bin/ec2-describe-reserved-instances-modifications +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstancesModifications "$@" ++exec ec2-cmd DescribeReservedInstancesModifications "$@" +--- a/bin/ec2-describe-vpc-attribute ++++ b/bin/ec2-describe-vpc-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpcAttribute "$@" ++exec ec2-cmd DescribeVpcAttribute "$@" +--- a/bin/ec2-modify-reserved-instances ++++ b/bin/ec2-modify-reserved-instances +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyReservedInstances "$@" ++exec ec2-cmd ModifyReservedInstances "$@" +--- a/bin/ec2-modify-vpc-attribute ++++ b/bin/ec2-modify-vpc-attribute +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyVpcAttribute "$@" ++exec ec2-cmd ModifyVpcAttribute "$@" +--- a/bin/ec2cpimg ++++ b/bin/ec2cpimg +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd CopyImage "$@" ++exec ec2-cmd CopyImage "$@" +--- a/bin/ec2daa ++++ b/bin/ec2daa +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeAccountAttributes "$@" ++exec ec2-cmd DescribeAccountAttributes "$@" +--- a/bin/ec2drim ++++ b/bin/ec2drim +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeReservedInstancesModifications "$@" ++exec ec2-cmd DescribeReservedInstancesModifications "$@" +--- a/bin/ec2dva ++++ b/bin/ec2dva +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd DescribeVpcAttribute "$@" ++exec ec2-cmd DescribeVpcAttribute "$@" +--- a/bin/ec2mri ++++ b/bin/ec2mri +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyReservedInstances "$@" ++exec ec2-cmd ModifyReservedInstances "$@" +--- a/bin/ec2mva ++++ b/bin/ec2mva +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/bin/sh + + # Copyright 2006-2010 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,6 +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. + +-__ZIP_PREFIX__EC2_HOME="${EC2_HOME:?EC2_HOME is not set}" +-__RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline +-"${EC2_HOME}"/bin/ec2-cmd ModifyVpcAttribute "$@" ++exec ec2-cmd ModifyVpcAttribute "$@" --- ec2-api-tools-1.6.12.0.orig/debian/rules +++ ec2-api-tools-1.6.12.0/debian/rules @@ -0,0 +1,71 @@ +#!/usr/bin/make -f + +JAVA_HOME = /usr + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +binprogs := $(shell cd bin && for x in *; do case $$x in (*.cmd) continue;; esac; echo $$x; done ) +ec2dash := $(filter ec2-%,$(binprogs)) +mainprogs := $(filter-out ec2-cmd,$(ec2dash)) +manpages := $(mainprogs:%=man/%.1) +usages := $(mainprogs:%=man/%.usage) +RUNENV = $(shell pwd="`pwd`" && echo "PATH=\"$${pwd}/bin:$$PATH\" EC2_BUILD_HOME=\"$${pwd}/lib\"") + +HAVE_JAVA = 1 +ifeq ($(HAVE_JAVA),0) +usage_bin_dep = +else +usage_bin_dep = bin/% +endif + +pre-commit: clean debian/ec2-version $(usages) + +debian/ec2-version: bin/ec2-version + $(RUNENV) ec2-version > $@ || { rm -f $@; exit 1; } + +binary-post-install/ec2-api-tools:: symlinks manpages + # we need no stinking windows batch scripts + rm -f debian/ec2-api-tools/usr/bin/*.cmd + while read prog links; do \ + for l in $$links; do \ + ln -sf $$prog debian/ec2-api-tools/usr/bin/$$l || exit; done; done < symlinks + mkdir -p debian/ec2-api-tools/usr/share/man/man1 + cp -a man/*.1 debian/ec2-api-tools/usr/share/man/man1 + while read prog links; do \ + for l in $$links; do \ + ln -sf $$prog.1.gz debian/ec2-api-tools/usr/share/man/man1/$$l.1.gz || exit; done; done < symlinks + +symlinks: debian/rules $(binprogs:%=bin/%) + chmod +x debian/find-symlinks + cd bin && ../debian/find-symlinks ../symlinks $(binprogs) + +usages: grantx $(usages) + +manpages: $(manpages) + +grantx: + cd bin && chmod +x $(binprogs) + +man/%.1: man/%.usage + chmod +x debian/xhelp2man + debian/xhelp2man man/$*.usage $* debian/name2desc $$(cat debian/ec2-version) > $@ + +man/%.usage: $(usage_bin_dep) + chmod +x $< bin/ec2-cmd + [ -d man ] || mkdir man + p=$@; p=$${p%.usage}; p=$${p#man/}; $(RUNENV) $$p --help > $@ || { [ $$? -eq 1 ] || exit 1; } + sed -i 's,^ ,,' "$@" + + +get-orig-source: + uscan --verbose --repack + +upstream-check: + @python debian/upstream-check ec2-api-tools + +clean:: + rm -Rf man/*.1 symlinks.txt + dh_clean + +.PHONY: upstream-check --- ec2-api-tools-1.6.12.0.orig/debian/upstream-check +++ ec2-api-tools-1.6.12.0/debian/upstream-check @@ -0,0 +1,88 @@ +#!/usr/bin/python +# vi: noexpandtab tabstop=4 +# upstream-check - utility for checking upstream amazon source +# +# Copyright (C) 2010 Canonical Ltd. +# +# Authors: Scott Moser +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +download_url = "http://s3.amazonaws.com/ec2-downloads/" +Usage = """ +Usage: upstream-check + +This will search the ec2 bucket xml, looking for files matching + and print the newest. + +Searches url: %s + +Example: + upstream-check ec2-api-tools +""" % download_url + +import urllib2 +import sys +import xml.dom.minidom + + +def getText(nodelist): + rc = [] + for node in nodelist: + if node.nodeType == node.TEXT_NODE: + rc.append(node.data) + return ''.join(rc) + +def main(basename): + xmlstr = urllib2.urlopen(download_url).read() + dom = xml.dom.minidom.parseString(xmlstr) + # each 'Contents' looks like: + # + # 2006-06-26.ec2.wsdl + # 2006-10-23T12:22:30.000Z + # "d4fa76ef26b78d3905e009de9db8bf7d" + # 28344 + # STANDARD + # + flist = ( "Key", "LastModified", "ETag", "Size", "StorageClass" ) + matches = [ ] + for content in dom.getElementsByTagName("Contents"): + fields = { } + for key in flist: + fields[key]=getText(content.getElementsByTagName(key)[0].childNodes) + try: + if not ( fields["Key"].startswith("%s-" % basename) and + fields["Key"].endswith(".zip")) : + continue + except KeyError: + continue + + # this seems badly behaved, timestamp gets updated too + if fields["Key"] == "ec2-api-tools-1.6.zip": + continue + matches.append(fields) + + matches.sort(cmp=lambda x,y: cmp(x["LastModified"], y["LastModified"])) + #for f in matches: + # print "%s\t%s\t%s" % (f["Key"], f["LastModified"], f["Size"]) + ent = matches[len(matches)-1] + print "%s\t%s\t%s" % (ent["Key"], ent["LastModified"], ent["Size"]) + +if __name__ == '__main__': + if len(sys.argv) == 2: + swith=sys.argv[1] + else: + sys.stderr.write(Usage) + sys.exit(1) + + main(swith) --- ec2-api-tools-1.6.12.0.orig/debian/watch +++ ec2-api-tools-1.6.12.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://s3.amazonaws.com/ec2-downloads/ec2-api-tools-([0-9.]*).zip --- ec2-api-tools-1.6.12.0.orig/debian/xhelp2man +++ ec2-api-tools-1.6.12.0/debian/xhelp2man @@ -0,0 +1,61 @@ +#!/bin/bash + +helpfile=$1 +name=$2 +name2desc=$3 +th=$(echo ${name} | tr '[a-z]' '[A-Z]') +ver=${4} +apidate=${5} +cr=" +" + +OIFS=${IFS} + +TEMP_D="" +cleanup() { + [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}" +} +TEMP_D=$(mktemp -d ${TMPDIR:-/tmp}/${0##*/}.XXXXXX) +trap cleanup EXIT + +helpout="${TEMP_D}/helpout" +sed 's,^[ ][ ],,' "${helpfile}" > "${helpout}" + +IFS=${cr} +sections=( $(egrep "^[A-Z][A-Z ]*$" "${helpout}" ) ) +IFS=${OIFS} + +getsection() { + local sec=$1 file=$2 + local sa # sed args + local ee="--expression=" + sa=( -e "/^${sec}$/,/^[A-Z][A-Z ]*/!d" ) + sa[${#sa[@]}]="-e" + sa[${#sa[@]}]="s/^${sec}$/.SH ${sec}\n.PP/" + sa[${#sa[@]}]=$ee's/--\([a-zA-Z-]*\)/\\fB--\1\\fR/g' + sa[${#sa[@]}]=$ee's/^\([[:space:]]*\)-\([a-zA-Z?]\)/\1\\fB-\2\\fR/' + sa[${#sa[@]}]=$ee's/-/\\-/g' + + sed "${sa[@]}" "$file" | sed -e 's,^ , ,' -e '$d' +} + +desc=$(awk '-F\t' '$1 == name { print $2 }' "name=${name}" "${name2desc}") +printf '.TH %s "%s" "%s" "%s" "%s"\n' "${th}" 1 "${ver} api=${apidate}" \ + "EC2 API command line tools" "User Commands" +cat <