diff -Nru ec2-api-tools-1.3.45772/bin/ec2addsds ec2-api-tools-1.3.46266/bin/ec2addsds
--- ec2-api-tools-1.3.45772/bin/ec2addsds	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2addsds	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd CreateSpotDatafeedSubscription "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2addsds.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2addsds.cmd
--- ec2-api-tools-1.3.45772/bin/ec2addsds.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2addsds.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" CreateSpotDatafeedSubscription %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-cancel-spot-instance-requests /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-cancel-spot-instance-requests
--- ec2-api-tools-1.3.45772/bin/ec2-cancel-spot-instance-requests	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-cancel-spot-instance-requests	2009-12-13 21:25:43.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd CancelSpotInstanceRequests "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-cancel-spot-instance-requests.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-cancel-spot-instance-requests.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-cancel-spot-instance-requests.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-cancel-spot-instance-requests.cmd	2009-12-13 21:25:43.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" CancelSpotInstanceRequests %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-create-spot-datafeed-subscription /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-create-spot-datafeed-subscription
--- ec2-api-tools-1.3.45772/bin/ec2-create-spot-datafeed-subscription	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-create-spot-datafeed-subscription	2009-12-13 21:25:43.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd CreateSpotDatafeedSubscription "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-create-spot-datafeed-subscription.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-create-spot-datafeed-subscription.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-create-spot-datafeed-subscription.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-create-spot-datafeed-subscription.cmd	2009-12-13 21:25:43.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" CreateSpotDatafeedSubscription %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2csir /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2csir
--- ec2-api-tools-1.3.45772/bin/ec2csir	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2csir	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd CancelSpotInstanceRequests "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2csir.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2csir.cmd
--- ec2-api-tools-1.3.45772/bin/ec2csir.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2csir.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" CancelSpotInstanceRequests %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-delete-spot-datafeed-subscription /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-delete-spot-datafeed-subscription
--- ec2-api-tools-1.3.45772/bin/ec2-delete-spot-datafeed-subscription	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-delete-spot-datafeed-subscription	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-delete-spot-datafeed-subscription.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-delete-spot-datafeed-subscription.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-delete-spot-datafeed-subscription.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-delete-spot-datafeed-subscription.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DeleteSpotDatafeedSubscription %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2delsds /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2delsds
--- ec2-api-tools-1.3.45772/bin/ec2delsds	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2delsds	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2delsds.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2delsds.cmd
--- ec2-api-tools-1.3.45772/bin/ec2delsds.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2delsds.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DeleteSpotDatafeedSubscription %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-describe-spot-datafeed-subscription /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-describe-spot-datafeed-subscription
--- ec2-api-tools-1.3.45772/bin/ec2-describe-spot-datafeed-subscription	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-describe-spot-datafeed-subscription	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-describe-spot-datafeed-subscription.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-describe-spot-datafeed-subscription.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-describe-spot-datafeed-subscription.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-describe-spot-datafeed-subscription.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DescribeSpotDatafeedSubscription %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-describe-spot-instance-requests /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-describe-spot-instance-requests
--- ec2-api-tools-1.3.45772/bin/ec2-describe-spot-instance-requests	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-describe-spot-instance-requests	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DescribeSpotInstanceRequests "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-describe-spot-instance-requests.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-describe-spot-instance-requests.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-describe-spot-instance-requests.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-describe-spot-instance-requests.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DescribeSpotInstanceRequests %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-describe-spot-price-history /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-describe-spot-price-history
--- ec2-api-tools-1.3.45772/bin/ec2-describe-spot-price-history	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-describe-spot-price-history	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DescribeSpotPriceHistory "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-describe-spot-price-history.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-describe-spot-price-history.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-describe-spot-price-history.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-describe-spot-price-history.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DescribeSpotPriceHistory %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2dsds /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2dsds
--- ec2-api-tools-1.3.45772/bin/ec2dsds	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2dsds	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2dsds.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2dsds.cmd
--- ec2-api-tools-1.3.45772/bin/ec2dsds.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2dsds.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DescribeSpotDatafeedSubscription %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2dsir /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2dsir
--- ec2-api-tools-1.3.45772/bin/ec2dsir	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2dsir	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DescribeSpotInstanceRequests "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2dsir.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2dsir.cmd
--- ec2-api-tools-1.3.45772/bin/ec2dsir.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2dsir.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DescribeSpotInstanceRequests %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2dsph /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2dsph
--- ec2-api-tools-1.3.45772/bin/ec2dsph	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2dsph	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd DescribeSpotPriceHistory "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2dsph.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2dsph.cmd
--- ec2-api-tools-1.3.45772/bin/ec2dsph.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2dsph.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" DescribeSpotPriceHistory %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-request-spot-instances /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-request-spot-instances
--- ec2-api-tools-1.3.45772/bin/ec2-request-spot-instances	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-request-spot-instances	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd RequestSpotInstances "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2-request-spot-instances.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2-request-spot-instances.cmd
--- ec2-api-tools-1.3.45772/bin/ec2-request-spot-instances.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2-request-spot-instances.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" RequestSpotInstances %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2rsi /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2rsi
--- ec2-api-tools-1.3.45772/bin/ec2rsi	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2rsi	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# 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
+# 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.
+
+EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+$EC2_HOME/bin/ec2-cmd RequestSpotInstances "$@"
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/bin/ec2rsi.cmd /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/bin/ec2rsi.cmd
--- ec2-api-tools-1.3.45772/bin/ec2rsi.cmd	1970-01-01 01:00:00.000000000 +0100
+++ ec2-api-tools-1.3.46266/bin/ec2rsi.cmd	2009-12-13 21:25:44.000000000 +0000
@@ -0,0 +1,25 @@
+@echo off
+
+setlocal
+
+REM Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+REM Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+REM License is located at http://aws.amazon.com/asl or in the "license" file accompanying this file.  This file is distributed on an "AS
+REM IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+REM language governing permissions and limitations under the License.
+
+REM Set intermediate env vars because the %VAR:x=y% notation below
+REM (which replaces the string x with the string y in VAR)
+REM doesn't handle undefined environment variables. This way
+REM we're always dealing with defined variables in those tests.
+set CHK_HOME=_%EC2_HOME%
+
+if "%CHK_HOME:"=%" == "_" goto HOME_MISSING
+
+"%EC2_HOME:"=%\bin\ec2-cmd" RequestSpotInstances %*
+goto DONE
+:HOME_MISSING
+echo EC2_HOME is not set
+exit /b 1
+
+:DONE
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/debian/changelog /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/debian/changelog
--- ec2-api-tools-1.3.45772/debian/changelog	2009-12-15 21:00:38.000000000 +0000
+++ ec2-api-tools-1.3.46266/debian/changelog	2009-12-15 21:00:39.000000000 +0000
@@ -1,14 +1,52 @@
-ec2-api-tools (1.3.45772-0ubuntu1~ppa2) hardy; urgency=low
+ec2-api-tools (1.3.46266-0ubuntu1~hardy1) hardy; urgency=low
 
-  * Backport to hardy
+  * New upstream release. API version 2009-11-30: Spot Instances
 
- -- Scott Moser <smoser@ubuntu.com>  Tue, 08 Dec 2009 09:58:53 -0500
+ -- Scott Moser <smoser@ubuntu.com>  Tue, 15 Dec 2009 15:26:23 -0500
 
-ec2-api-tools (1.3.34128-0ubuntu2~ppa3) hardy; urgency=low
+ec2-api-tools (1.3.45772-0ubuntu1) lucid; urgency=low
 
-  * Backport for hardy.
+  * New upstream release. support 2009-10-31 api (EBS root, us-west-1)
+  * change using bash to sh and use exec in wrapper scripts
 
- -- Chuck Short <zulcss@ubuntu.com>  Thu, 26 Mar 2009 09:59:49 -0400
+ -- Scott Moser <smoser@ubuntu.com>  Mon, 07 Dec 2009 15:54:43 -0500
+
+ec2-api-tools (1.3.42584-0ubuntu1) lucid; urgency=low
+
+  *  New release.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 17 Nov 2009 10:02:53 -0500
+
+ec2-api-tools (1.3.36506-0ubuntu5) karmic; urgency=low
+
+  * debian/patches/ubuntu-fix-paths.patch: Include
+    ec2{{u,}min,-{un,}monitor-instances}. (LP: #419464)
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 09 Sep 2009 11:16:34 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu4) karmic; urgency=low
+
+  * ec2-cmd: remove need for setting JAVA_HOME (LP: #410328)
+
+ -- Scott Moser <smoser@ubuntu.com>  Wed, 12 Aug 2009 16:20:54 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu3) karmic; urgency=low
+
+  * Really fix cmd wrappers. Thanks to Ville Aine. (LP: #363931) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Wed, 12 Aug 2009 09:31:15 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu2) karmic; urgency=low
+
+  * Remove *.cmd wrappers (LP: #363931) 
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 08 Jun 2009 08:57:31 -0400
+
+ec2-api-tools (1.3.36506-0ubuntu1) karmic; urgency=low
+
+  * New version.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 01 Jun 2009 20:19:17 -0400
 
 ec2-api-tools (1.3.34128-0ubuntu2) jaunty; urgency=low
 
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/debian/patches/ubuntu-fix-paths.patch /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/debian/patches/ubuntu-fix-paths.patch
--- ec2-api-tools-1.3.45772/debian/patches/ubuntu-fix-paths.patch	2009-12-15 21:00:38.000000000 +0000
+++ ec2-api-tools-1.3.46266/debian/patches/ubuntu-fix-paths.patch	2009-12-15 21:00:39.000000000 +0000
@@ -15,8 +15,8 @@
 done
 
 === modified file 'bin/ec2-add-group'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-add-group	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-add-group	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-add-group	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-add-group	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -32,8 +32,8 @@
 +exec ec2-cmd AddGroup "$@"
 
 === modified file 'bin/ec2-add-keypair'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-add-keypair	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-add-keypair	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-add-keypair	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-add-keypair	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -49,8 +49,8 @@
 +exec ec2-cmd CreateKeyPair "$@"
 
 === modified file 'bin/ec2-allocate-address'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-allocate-address	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-allocate-address	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-allocate-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-allocate-address	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -66,8 +66,8 @@
 +exec ec2-cmd AllocateAddress "$@"
 
 === modified file 'bin/ec2-associate-address'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-associate-address	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-associate-address	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-associate-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-associate-address	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -83,8 +83,8 @@
 +exec ec2-cmd AssociateAddress "$@"
 
 === modified file 'bin/ec2-associate-dhcp-options'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-associate-dhcp-options	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-associate-dhcp-options	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-associate-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-associate-dhcp-options	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -100,8 +100,8 @@
 +exec ec2-cmd AssociateDhcpOptions "$@"
 
 === modified file 'bin/ec2-attach-volume'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-attach-volume	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-attach-volume	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-attach-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-attach-volume	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -117,8 +117,8 @@
 +exec ec2-cmd AttachVolume "$@"
 
 === modified file 'bin/ec2-attach-vpn-gateway'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-attach-vpn-gateway	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-attach-vpn-gateway	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-attach-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-attach-vpn-gateway	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -134,8 +134,8 @@
 +exec ec2-cmd AttachVpnGateway "$@"
 
 === modified file 'bin/ec2-authorize'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-authorize	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-authorize	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-authorize	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-authorize	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -151,8 +151,8 @@
 +exec ec2-cmd AuthorizeGroup "$@"
 
 === modified file 'bin/ec2-bundle-instance'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-bundle-instance	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-bundle-instance	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-bundle-instance	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-bundle-instance	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -168,8 +168,8 @@
 +exec ec2-cmd BundleInstance "$@"
 
 === modified file 'bin/ec2-cancel-bundle-task'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-cancel-bundle-task	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-cancel-bundle-task	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-cancel-bundle-task	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-cancel-bundle-task	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -184,9 +184,26 @@
 -$EC2_HOME/bin/ec2-cmd CancelBundleTask "$@"
 +exec ec2-cmd CancelBundleTask "$@"
 
+=== modified file 'bin/ec2-cancel-spot-instance-requests'
+--- ec2-api-tools.orig/bin/ec2-cancel-spot-instance-requests	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-cancel-spot-instance-requests	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CancelSpotInstanceRequests "$@"
++exec ec2-cmd CancelSpotInstanceRequests "$@"
+
 === modified file 'bin/ec2-confirm-product-instance'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-confirm-product-instance	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-confirm-product-instance	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-confirm-product-instance	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-confirm-product-instance	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -202,8 +219,8 @@
 +exec ec2-cmd ConfirmProductInstance "$@"
 
 === modified file 'bin/ec2-create-customer-gateway'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-customer-gateway	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-customer-gateway	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-customer-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-customer-gateway	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -219,8 +236,8 @@
 +exec ec2-cmd CreateCustomerGateway "$@"
 
 === modified file 'bin/ec2-create-dhcp-options'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-dhcp-options	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-dhcp-options	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-dhcp-options	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -236,8 +253,8 @@
 +exec ec2-cmd CreateDhcpOptions "$@"
 
 === modified file 'bin/ec2-create-image'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-image	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-image	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-image	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-image	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -253,8 +270,8 @@
 +exec ec2-cmd CreateImage "$@"
 
 === modified file 'bin/ec2-create-snapshot'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-snapshot	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-snapshot	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-snapshot	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-snapshot	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -269,9 +286,26 @@
 -$EC2_HOME/bin/ec2-cmd CreateSnapshot "$@"
 +exec ec2-cmd CreateSnapshot "$@"
 
+=== modified file 'bin/ec2-create-spot-datafeed-subscription'
+--- ec2-api-tools.orig/bin/ec2-create-spot-datafeed-subscription	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-spot-datafeed-subscription	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSpotDatafeedSubscription "$@"
++exec ec2-cmd CreateSpotDatafeedSubscription "$@"
+
 === modified file 'bin/ec2-create-subnet'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-subnet	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-subnet	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-subnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-subnet	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -287,8 +321,8 @@
 +exec ec2-cmd CreateSubnet "$@"
 
 === modified file 'bin/ec2-create-volume'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-volume	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-volume	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-volume	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -304,8 +338,8 @@
 +exec ec2-cmd CreateVolume "$@"
 
 === modified file 'bin/ec2-create-vpc'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-vpc	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-vpc	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-vpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-vpc	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -321,8 +355,8 @@
 +exec ec2-cmd CreateVpc "$@"
 
 === modified file 'bin/ec2-create-vpn-connection'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-vpn-connection	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-vpn-connection	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-vpn-connection	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-vpn-connection	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -338,8 +372,8 @@
 +exec ec2-cmd CreateVpnConnection "$@"
 
 === modified file 'bin/ec2-create-vpn-gateway'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-create-vpn-gateway	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-create-vpn-gateway	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-create-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-create-vpn-gateway	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -355,8 +389,8 @@
 +exec ec2-cmd CreateVpnGateway "$@"
 
 === modified file 'bin/ec2-delete-customer-gateway'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-customer-gateway	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-customer-gateway	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-customer-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-customer-gateway	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -372,8 +406,8 @@
 +exec ec2-cmd DeleteCustomerGateway "$@"
 
 === modified file 'bin/ec2-delete-dhcp-options'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-dhcp-options	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-dhcp-options	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-dhcp-options	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -389,8 +423,8 @@
 +exec ec2-cmd DeleteDhcpOptions "$@"
 
 === modified file 'bin/ec2-delete-group'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-group	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-group	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-group	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-group	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -406,8 +440,8 @@
 +exec ec2-cmd DeleteGroup "$@"
 
 === modified file 'bin/ec2-delete-keypair'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-keypair	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-keypair	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-keypair	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-keypair	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -423,8 +457,8 @@
 +exec ec2-cmd DeleteKeyPair "$@"
 
 === modified file 'bin/ec2-delete-snapshot'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-snapshot	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-snapshot	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-snapshot	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-snapshot	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -439,9 +473,26 @@
 -$EC2_HOME/bin/ec2-cmd DeleteSnapshot "$@"
 +exec ec2-cmd DeleteSnapshot "$@"
 
+=== modified file 'bin/ec2-delete-spot-datafeed-subscription'
+--- ec2-api-tools.orig/bin/ec2-delete-spot-datafeed-subscription	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-spot-datafeed-subscription	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@"
++exec ec2-cmd DeleteSpotDatafeedSubscription "$@"
+
 === modified file 'bin/ec2-delete-subnet'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-subnet	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-subnet	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-subnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-subnet	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -457,8 +508,8 @@
 +exec ec2-cmd DeleteSubnet "$@"
 
 === modified file 'bin/ec2-delete-volume'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-volume	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-volume	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-volume	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -474,8 +525,8 @@
 +exec ec2-cmd DeleteVolume "$@"
 
 === modified file 'bin/ec2-delete-vpc'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-vpc	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-vpc	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-vpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-vpc	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -491,8 +542,8 @@
 +exec ec2-cmd DeleteVpc "$@"
 
 === modified file 'bin/ec2-delete-vpn-connection'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-vpn-connection	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-vpn-connection	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-vpn-connection	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-vpn-connection	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -508,8 +559,8 @@
 +exec ec2-cmd DeleteVpnConnection "$@"
 
 === modified file 'bin/ec2-delete-vpn-gateway'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-delete-vpn-gateway	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-delete-vpn-gateway	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-delete-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-delete-vpn-gateway	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -525,8 +576,8 @@
 +exec ec2-cmd DeleteVpnGateway "$@"
 
 === modified file 'bin/ec2-deregister'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-deregister	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-deregister	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-deregister	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-deregister	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -542,8 +593,8 @@
 +exec ec2-cmd DeregisterImage "$@"
 
 === modified file 'bin/ec2-describe-addresses'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-addresses	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-addresses	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-addresses	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-addresses	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -559,8 +610,8 @@
 +exec ec2-cmd DescribeAddresses "$@"
 
 === modified file 'bin/ec2-describe-availability-zones'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-availability-zones	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-availability-zones	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-availability-zones	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-availability-zones	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -576,8 +627,8 @@
 +exec ec2-cmd DescribeAvailabilityZones "$@"
 
 === modified file 'bin/ec2-describe-bundle-tasks'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-bundle-tasks	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-bundle-tasks	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-bundle-tasks	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-bundle-tasks	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -593,8 +644,8 @@
 +exec ec2-cmd DescribeBundleTasks "$@"
 
 === modified file 'bin/ec2-describe-customer-gateways'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-customer-gateways	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-customer-gateways	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-customer-gateways	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-customer-gateways	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -610,8 +661,8 @@
 +exec ec2-cmd DescribeCustomerGateways "$@"
 
 === modified file 'bin/ec2-describe-dhcp-options'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-dhcp-options	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-dhcp-options	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-dhcp-options	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-dhcp-options	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -627,8 +678,8 @@
 +exec ec2-cmd DescribeDhcpOptions "$@"
 
 === modified file 'bin/ec2-describe-group'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-group	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-group	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-group	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-group	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -644,8 +695,8 @@
 +exec ec2-cmd DescribeGroups "$@"
 
 === modified file 'bin/ec2-describe-image-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-image-attribute	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-image-attribute	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-image-attribute	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-image-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -661,8 +712,8 @@
 +exec ec2-cmd DescribeImageAttribute "$@"
 
 === modified file 'bin/ec2-describe-images'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-images	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-images	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-images	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-images	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -678,8 +729,8 @@
 +exec ec2-cmd DescribeImages "$@"
 
 === modified file 'bin/ec2-describe-instance-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-instance-attribute	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-instance-attribute	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-instance-attribute	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-instance-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -695,8 +746,8 @@
 +exec ec2-cmd DescribeInstanceAttribute "$@"
 
 === modified file 'bin/ec2-describe-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-instances	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-instances	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -712,8 +763,8 @@
 +exec ec2-cmd DescribeInstances "$@"
 
 === modified file 'bin/ec2-describe-keypairs'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-keypairs	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-keypairs	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-keypairs	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-keypairs	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -729,8 +780,8 @@
 +exec ec2-cmd DescribeKeyPairs "$@"
 
 === modified file 'bin/ec2-describe-regions'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-regions	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-regions	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-regions	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-regions	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -746,8 +797,8 @@
 +exec ec2-cmd DescribeRegions "$@"
 
 === modified file 'bin/ec2-describe-reserved-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-reserved-instances	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-reserved-instances	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-reserved-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-reserved-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -763,8 +814,8 @@
 +exec ec2-cmd DescribeReservedInstances "$@"
 
 === modified file 'bin/ec2-describe-reserved-instances-offerings'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-reserved-instances-offerings	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-reserved-instances-offerings	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-reserved-instances-offerings	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-reserved-instances-offerings	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -780,8 +831,8 @@
 +exec ec2-cmd DescribeReservedInstancesOfferings "$@"
 
 === modified file 'bin/ec2-describe-snapshot-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-snapshot-attribute	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-snapshot-attribute	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-snapshot-attribute	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-snapshot-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -797,8 +848,8 @@
 +exec ec2-cmd DescribeSnapshotAttribute "$@"
 
 === modified file 'bin/ec2-describe-snapshots'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-snapshots	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-snapshots	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-snapshots	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-snapshots	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -813,9 +864,60 @@
 -$EC2_HOME/bin/ec2-cmd DescribeSnapshots "$@"
 +exec ec2-cmd DescribeSnapshots "$@"
 
+=== modified file 'bin/ec2-describe-spot-datafeed-subscription'
+--- ec2-api-tools.orig/bin/ec2-describe-spot-datafeed-subscription	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-spot-datafeed-subscription	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@"
++exec ec2-cmd DescribeSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2-describe-spot-instance-requests'
+--- ec2-api-tools.orig/bin/ec2-describe-spot-instance-requests	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-spot-instance-requests	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotInstanceRequests "$@"
++exec ec2-cmd DescribeSpotInstanceRequests "$@"
+
+=== modified file 'bin/ec2-describe-spot-price-history'
+--- ec2-api-tools.orig/bin/ec2-describe-spot-price-history	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-spot-price-history	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotPriceHistory "$@"
++exec ec2-cmd DescribeSpotPriceHistory "$@"
+
 === modified file 'bin/ec2-describe-subnets'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-subnets	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-subnets	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-subnets	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-subnets	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -831,8 +933,8 @@
 +exec ec2-cmd DescribeSubnets "$@"
 
 === modified file 'bin/ec2-describe-volumes'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-volumes	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-volumes	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-volumes	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-volumes	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -848,8 +950,8 @@
 +exec ec2-cmd DescribeVolumes "$@"
 
 === modified file 'bin/ec2-describe-vpcs'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-vpcs	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-vpcs	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-vpcs	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-vpcs	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -865,8 +967,8 @@
 +exec ec2-cmd DescribeVpcs "$@"
 
 === modified file 'bin/ec2-describe-vpn-connections'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-vpn-connections	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-vpn-connections	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-vpn-connections	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-vpn-connections	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -882,8 +984,8 @@
 +exec ec2-cmd DescribeVpnConnections "$@"
 
 === modified file 'bin/ec2-describe-vpn-gateways'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-describe-vpn-gateways	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-describe-vpn-gateways	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-describe-vpn-gateways	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-describe-vpn-gateways	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -899,8 +1001,8 @@
 +exec ec2-cmd DescribeVpnGateways "$@"
 
 === modified file 'bin/ec2-detach-volume'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-detach-volume	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-detach-volume	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-detach-volume	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-detach-volume	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -916,8 +1018,8 @@
 +exec ec2-cmd DetachVolume "$@"
 
 === modified file 'bin/ec2-detach-vpn-gateway'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-detach-vpn-gateway	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-detach-vpn-gateway	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-detach-vpn-gateway	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-detach-vpn-gateway	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -933,8 +1035,8 @@
 +exec ec2-cmd DetachVpnGateway "$@"
 
 === modified file 'bin/ec2-disassociate-address'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-disassociate-address	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-disassociate-address	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2-disassociate-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-disassociate-address	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -950,8 +1052,8 @@
 +exec ec2-cmd DisassociateAddress "$@"
 
 === modified file 'bin/ec2-fingerprint-key'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-fingerprint-key	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-fingerprint-key	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-fingerprint-key	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-fingerprint-key	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -967,8 +1069,8 @@
 +exec ec2-cmd FingerprintKey "$@"
 
 === modified file 'bin/ec2-get-console-output'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-get-console-output	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-get-console-output	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-get-console-output	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-get-console-output	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -984,8 +1086,8 @@
 +exec ec2-cmd GetConsoleOutput "$@"
 
 === modified file 'bin/ec2-get-password'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-get-password	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-get-password	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-get-password	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-get-password	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1001,8 +1103,8 @@
 +exec ec2-cmd GetPassword "$@"
 
 === modified file 'bin/ec2-migrate-image'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-migrate-image	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-migrate-image	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-migrate-image	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-migrate-image	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1018,8 +1120,8 @@
 +exec ec2-cmd MigrateBundle "$@"
 
 === modified file 'bin/ec2-modify-image-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-modify-image-attribute	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-modify-image-attribute	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-modify-image-attribute	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-modify-image-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1035,8 +1137,8 @@
 +exec ec2-cmd ModifyImageAttribute "$@"
 
 === modified file 'bin/ec2-modify-instance-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-modify-instance-attribute	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-modify-instance-attribute	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-modify-instance-attribute	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-modify-instance-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1052,8 +1154,8 @@
 +exec ec2-cmd ModifyInstanceAttribute "$@"
 
 === modified file 'bin/ec2-modify-snapshot-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-modify-snapshot-attribute	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-modify-snapshot-attribute	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-modify-snapshot-attribute	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-modify-snapshot-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1069,8 +1171,8 @@
 +exec ec2-cmd ModifySnapshotAttribute "$@"
 
 === modified file 'bin/ec2-monitor-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-monitor-instances	2009-06-01 20:19:17 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-monitor-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-monitor-instances	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2-monitor-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1086,8 +1188,8 @@
 +exec ec2-cmd MonitorInstances "$@"
 
 === modified file 'bin/ec2-purchase-reserved-instances-offering'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-purchase-reserved-instances-offering	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-purchase-reserved-instances-offering	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-purchase-reserved-instances-offering	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-purchase-reserved-instances-offering	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1103,8 +1205,8 @@
 +exec ec2-cmd PurchaseReservedInstancesOffering "$@"
 
 === modified file 'bin/ec2-reboot-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-reboot-instances	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-reboot-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-reboot-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-reboot-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1120,8 +1222,8 @@
 +exec ec2-cmd RebootInstances "$@"
 
 === modified file 'bin/ec2-register'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-register	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-register	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-register	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-register	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1137,8 +1239,8 @@
 +exec ec2-cmd RegisterImage "$@"
 
 === modified file 'bin/ec2-release-address'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-release-address	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-release-address	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-release-address	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-release-address	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1153,9 +1255,26 @@
 -$EC2_HOME/bin/ec2-cmd ReleaseAddress "$@"
 +exec ec2-cmd ReleaseAddress "$@"
 
+=== modified file 'bin/ec2-request-spot-instances'
+--- ec2-api-tools.orig/bin/ec2-request-spot-instances	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2-request-spot-instances	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RequestSpotInstances "$@"
++exec ec2-cmd RequestSpotInstances "$@"
+
 === modified file 'bin/ec2-reset-image-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-reset-image-attribute	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-reset-image-attribute	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-reset-image-attribute	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-reset-image-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1171,8 +1290,8 @@
 +exec ec2-cmd ResetImageAttribute "$@"
 
 === modified file 'bin/ec2-reset-instance-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-reset-instance-attribute	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-reset-instance-attribute	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-reset-instance-attribute	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-reset-instance-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1188,8 +1307,8 @@
 +exec ec2-cmd ResetInstanceAttribute "$@"
 
 === modified file 'bin/ec2-reset-snapshot-attribute'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-reset-snapshot-attribute	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-reset-snapshot-attribute	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-reset-snapshot-attribute	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2-reset-snapshot-attribute	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1205,8 +1324,8 @@
 +exec ec2-cmd ResetSnapshotAttribute "$@"
 
 === modified file 'bin/ec2-revoke'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-revoke	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-revoke	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-revoke	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-revoke	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1222,8 +1341,8 @@
 +exec ec2-cmd RevokeGroup "$@"
 
 === modified file 'bin/ec2-run-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-run-instances	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-run-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-run-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-run-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1239,8 +1358,8 @@
 +exec ec2-cmd RunInstances "$@"
 
 === modified file 'bin/ec2-start-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-start-instances	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-start-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-start-instances	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-start-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1256,8 +1375,8 @@
 +exec ec2-cmd StartInstances "$@"
 
 === modified file 'bin/ec2-stop-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-stop-instances	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-stop-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-stop-instances	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2-stop-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1273,8 +1392,8 @@
 +exec ec2-cmd StopInstances "$@"
 
 === modified file 'bin/ec2-terminate-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-terminate-instances	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-terminate-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-terminate-instances	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-terminate-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1290,8 +1409,8 @@
 +exec ec2-cmd TerminateInstances "$@"
 
 === modified file 'bin/ec2-unmonitor-instances'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-unmonitor-instances	2009-06-01 20:19:17 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-unmonitor-instances	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-unmonitor-instances	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2-unmonitor-instances	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1307,8 +1426,8 @@
 +exec ec2-cmd UnmonitorInstances "$@"
 
 === modified file 'bin/ec2-version'
---- ec2-api-tools-1.3.42584.orig/bin/ec2-version	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2-version	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2-version	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2-version	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1324,8 +1443,8 @@
 +exec ec2-cmd ShowVersion "$@"
 
 === modified file 'bin/ec2addcgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addcgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addcgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addcgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addcgw	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1341,8 +1460,8 @@
 +exec ec2-cmd CreateCustomerGateway "$@"
 
 === modified file 'bin/ec2adddopt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2adddopt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2adddopt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2adddopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2adddopt	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1358,8 +1477,8 @@
 +exec ec2-cmd CreateDhcpOptions "$@"
 
 === modified file 'bin/ec2addgrp'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addgrp	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addgrp	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addgrp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addgrp	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1375,8 +1494,8 @@
 +exec ec2-cmd AddGroup "$@"
 
 === modified file 'bin/ec2addkey'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addkey	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addkey	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addkey	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addkey	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1391,9 +1510,26 @@
 -$EC2_HOME/bin/ec2-cmd CreateKeyPair "$@"
 +exec ec2-cmd CreateKeyPair "$@"
 
+=== modified file 'bin/ec2addsds'
+--- ec2-api-tools.orig/bin/ec2addsds	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2addsds	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CreateSpotDatafeedSubscription "$@"
++exec ec2-cmd CreateSpotDatafeedSubscription "$@"
+
 === modified file 'bin/ec2addsnap'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addsnap	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addsnap	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addsnap	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addsnap	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1409,8 +1545,8 @@
 +exec ec2-cmd CreateSnapshot "$@"
 
 === modified file 'bin/ec2addsubnet'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addsubnet	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addsubnet	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addsubnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addsubnet	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1426,8 +1562,8 @@
 +exec ec2-cmd CreateSubnet "$@"
 
 === modified file 'bin/ec2addvgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addvgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addvgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addvgw	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1443,8 +1579,8 @@
 +exec ec2-cmd CreateVpnGateway "$@"
 
 === modified file 'bin/ec2addvol'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addvol	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addvol	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2addvol	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1460,8 +1596,8 @@
 +exec ec2-cmd CreateVolume "$@"
 
 === modified file 'bin/ec2addvpc'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addvpc	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addvpc	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addvpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addvpc	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1477,8 +1613,8 @@
 +exec ec2-cmd CreateVpc "$@"
 
 === modified file 'bin/ec2addvpn'
---- ec2-api-tools-1.3.42584.orig/bin/ec2addvpn	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2addvpn	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2addvpn	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2addvpn	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1494,8 +1630,8 @@
 +exec ec2-cmd CreateVpnConnection "$@"
 
 === modified file 'bin/ec2allocaddr'
---- ec2-api-tools-1.3.42584.orig/bin/ec2allocaddr	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2allocaddr	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2allocaddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2allocaddr	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1511,8 +1647,8 @@
 +exec ec2-cmd AllocateAddress "$@"
 
 === modified file 'bin/ec2assocaddr'
---- ec2-api-tools-1.3.42584.orig/bin/ec2assocaddr	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2assocaddr	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2assocaddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2assocaddr	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1528,8 +1664,8 @@
 +exec ec2-cmd AssociateAddress "$@"
 
 === modified file 'bin/ec2assocdopt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2assocdopt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2assocdopt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2assocdopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2assocdopt	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1545,8 +1681,8 @@
 +exec ec2-cmd AssociateDhcpOptions "$@"
 
 === modified file 'bin/ec2attvgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2attvgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2attvgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2attvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2attvgw	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1562,8 +1698,8 @@
 +exec ec2-cmd AttachVpnGateway "$@"
 
 === modified file 'bin/ec2attvol'
---- ec2-api-tools-1.3.42584.orig/bin/ec2attvol	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2attvol	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2attvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2attvol	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1579,8 +1715,8 @@
 +exec ec2-cmd AttachVolume "$@"
 
 === modified file 'bin/ec2auth'
---- ec2-api-tools-1.3.42584.orig/bin/ec2auth	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2auth	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2auth	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2auth	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1596,8 +1732,8 @@
 +exec ec2-cmd AuthorizeGroup "$@"
 
 === modified file 'bin/ec2bundle'
---- ec2-api-tools-1.3.42584.orig/bin/ec2bundle	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2bundle	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2bundle	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2bundle	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1613,8 +1749,8 @@
 +exec ec2-cmd BundleInstance "$@"
 
 === modified file 'bin/ec2cbun'
---- ec2-api-tools-1.3.42584.orig/bin/ec2cbun	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2cbun	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2cbun	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2cbun	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1630,8 +1766,8 @@
 +exec ec2-cmd CancelBundleTask "$@"
 
 === modified file 'bin/ec2cim'
---- ec2-api-tools-1.3.42584.orig/bin/ec2cim	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2cim	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2cim	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2cim	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1647,8 +1783,8 @@
 +exec ec2-cmd CreateImage "$@"
 
 === modified file 'bin/ec2cpi'
---- ec2-api-tools-1.3.42584.orig/bin/ec2cpi	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2cpi	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2cpi	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2cpi	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1663,9 +1799,26 @@
 -$EC2_HOME/bin/ec2-cmd ConfirmProductInstance "$@"
 +exec ec2-cmd ConfirmProductInstance "$@"
 
+=== modified file 'bin/ec2csir'
+--- ec2-api-tools.orig/bin/ec2csir	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2csir	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd CancelSpotInstanceRequests "$@"
++exec ec2-cmd CancelSpotInstanceRequests "$@"
+
 === modified file 'bin/ec2daddr'
---- ec2-api-tools-1.3.42584.orig/bin/ec2daddr	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2daddr	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2daddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2daddr	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1681,8 +1834,8 @@
 +exec ec2-cmd DescribeAddresses "$@"
 
 === modified file 'bin/ec2datt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2datt	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2datt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2datt	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2datt	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1698,8 +1851,8 @@
 +exec ec2-cmd DescribeImageAttribute "$@"
 
 === modified file 'bin/ec2daz'
---- ec2-api-tools-1.3.42584.orig/bin/ec2daz	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2daz	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2daz	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2daz	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1715,8 +1868,8 @@
 +exec ec2-cmd DescribeAvailabilityZones "$@"
 
 === modified file 'bin/ec2dbun'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dbun	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dbun	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dbun	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dbun	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1732,8 +1885,8 @@
 +exec ec2-cmd DescribeBundleTasks "$@"
 
 === modified file 'bin/ec2dcgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dcgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dcgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dcgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dcgw	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1749,8 +1902,8 @@
 +exec ec2-cmd DescribeCustomerGateways "$@"
 
 === modified file 'bin/ec2ddopt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2ddopt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2ddopt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2ddopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2ddopt	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1766,8 +1919,8 @@
 +exec ec2-cmd DescribeDhcpOptions "$@"
 
 === modified file 'bin/ec2delcgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delcgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delcgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delcgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delcgw	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1783,8 +1936,8 @@
 +exec ec2-cmd DeleteCustomerGateway "$@"
 
 === modified file 'bin/ec2deldopt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2deldopt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2deldopt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2deldopt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2deldopt	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1800,8 +1953,8 @@
 +exec ec2-cmd DeleteDhcpOptions "$@"
 
 === modified file 'bin/ec2delgrp'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delgrp	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delgrp	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delgrp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delgrp	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1817,8 +1970,8 @@
 +exec ec2-cmd DeleteGroup "$@"
 
 === modified file 'bin/ec2delkey'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delkey	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delkey	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delkey	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delkey	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1833,9 +1986,26 @@
 -$EC2_HOME/bin/ec2-cmd DeleteKeyPair "$@"
 +exec ec2-cmd DeleteKeyPair "$@"
 
+=== modified file 'bin/ec2delsds'
+--- ec2-api-tools.orig/bin/ec2delsds	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2delsds	2009-12-15 20:18:25 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DeleteSpotDatafeedSubscription "$@"
++exec ec2-cmd DeleteSpotDatafeedSubscription "$@"
+
 === modified file 'bin/ec2delsnap'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delsnap	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delsnap	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delsnap	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delsnap	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1851,8 +2021,8 @@
 +exec ec2-cmd DeleteSnapshot "$@"
 
 === modified file 'bin/ec2delsubnet'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delsubnet	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delsubnet	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delsubnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delsubnet	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1868,8 +2038,8 @@
 +exec ec2-cmd DeleteSubnet "$@"
 
 === modified file 'bin/ec2delvgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delvgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delvgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delvgw	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1885,8 +2055,8 @@
 +exec ec2-cmd DeleteVpnGateway "$@"
 
 === modified file 'bin/ec2delvol'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delvol	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delvol	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2delvol	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1902,8 +2072,8 @@
 +exec ec2-cmd DeleteVolume "$@"
 
 === modified file 'bin/ec2delvpc'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delvpc	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delvpc	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delvpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delvpc	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1919,8 +2089,8 @@
 +exec ec2-cmd DeleteVpc "$@"
 
 === modified file 'bin/ec2delvpn'
---- ec2-api-tools-1.3.42584.orig/bin/ec2delvpn	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2delvpn	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2delvpn	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2delvpn	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1936,8 +2106,8 @@
 +exec ec2-cmd DeleteVpnConnection "$@"
 
 === modified file 'bin/ec2dereg'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dereg	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dereg	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dereg	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dereg	2009-12-15 20:18:25 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1953,8 +2123,8 @@
 +exec ec2-cmd DeregisterImage "$@"
 
 === modified file 'bin/ec2detvgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2detvgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2detvgw	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2detvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2detvgw	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1970,8 +2140,8 @@
 +exec ec2-cmd DetachVpnGateway "$@"
 
 === modified file 'bin/ec2detvol'
---- ec2-api-tools-1.3.42584.orig/bin/ec2detvol	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2detvol	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2detvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2detvol	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -1987,8 +2157,8 @@
 +exec ec2-cmd DetachVolume "$@"
 
 === modified file 'bin/ec2dgrp'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dgrp	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dgrp	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dgrp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dgrp	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2004,8 +2174,8 @@
 +exec ec2-cmd DescribeGroups "$@"
 
 === modified file 'bin/ec2diatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2diatt	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2diatt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2diatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2diatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2021,8 +2191,8 @@
 +exec ec2-cmd DescribeInstanceAttribute "$@"
 
 === modified file 'bin/ec2dim'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dim	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dim	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dim	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dim	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2038,8 +2208,8 @@
 +exec ec2-cmd DescribeImages "$@"
 
 === modified file 'bin/ec2dimatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dimatt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dimatt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dimatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dimatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2055,8 +2225,8 @@
 +exec ec2-cmd DescribeImageAttribute "$@"
 
 === modified file 'bin/ec2din'
---- ec2-api-tools-1.3.42584.orig/bin/ec2din	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2din	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2din	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2din	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2072,8 +2242,8 @@
 +exec ec2-cmd DescribeInstances "$@"
 
 === modified file 'bin/ec2dinatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dinatt	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dinatt	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dinatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2dinatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2089,8 +2259,8 @@
 +exec ec2-cmd DescribeInstanceAttribute "$@"
 
 === modified file 'bin/ec2disaddr'
---- ec2-api-tools-1.3.42584.orig/bin/ec2disaddr	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2disaddr	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2disaddr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2disaddr	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2106,8 +2276,8 @@
 +exec ec2-cmd DisassociateAddress "$@"
 
 === modified file 'bin/ec2dkey'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dkey	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dkey	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dkey	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dkey	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2123,8 +2293,8 @@
 +exec ec2-cmd DescribeKeyPairs "$@"
 
 === modified file 'bin/ec2dre'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dre	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dre	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dre	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dre	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2140,8 +2310,8 @@
 +exec ec2-cmd DescribeRegions "$@"
 
 === modified file 'bin/ec2dri'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dri	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dri	2009-12-07 19:53:32 +0000
+--- ec2-api-tools.orig/bin/ec2dri	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dri	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2157,8 +2327,8 @@
 +exec ec2-cmd DescribeReservedInstances "$@"
 
 === modified file 'bin/ec2drio'
---- ec2-api-tools-1.3.42584.orig/bin/ec2drio	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2drio	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2drio	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2drio	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2173,9 +2343,43 @@
 -$EC2_HOME/bin/ec2-cmd DescribeReservedInstancesOfferings "$@"
 +exec ec2-cmd DescribeReservedInstancesOfferings "$@"
 
+=== modified file 'bin/ec2dsds'
+--- ec2-api-tools.orig/bin/ec2dsds	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2dsds	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotDatafeedSubscription "$@"
++exec ec2-cmd DescribeSpotDatafeedSubscription "$@"
+
+=== modified file 'bin/ec2dsir'
+--- ec2-api-tools.orig/bin/ec2dsir	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2dsir	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotInstanceRequests "$@"
++exec ec2-cmd DescribeSpotInstanceRequests "$@"
+
 === modified file 'bin/ec2dsnap'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dsnap	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dsnap	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dsnap	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dsnap	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2191,8 +2395,8 @@
 +exec ec2-cmd DescribeSnapshots "$@"
 
 === modified file 'bin/ec2dsnapatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dsnapatt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dsnapatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dsnapatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dsnapatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2207,9 +2411,26 @@
 -$EC2_HOME/bin/ec2-cmd DescribeSnapshotAttribute "$@"
 +exec ec2-cmd DescribeSnapshotAttribute "$@"
 
+=== modified file 'bin/ec2dsph'
+--- ec2-api-tools.orig/bin/ec2dsph	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2dsph	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd DescribeSpotPriceHistory "$@"
++exec ec2-cmd DescribeSpotPriceHistory "$@"
+
 === modified file 'bin/ec2dsubnet'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dsubnet	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dsubnet	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dsubnet	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dsubnet	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2225,8 +2446,8 @@
 +exec ec2-cmd DescribeSubnets "$@"
 
 === modified file 'bin/ec2dvgw'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dvgw	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dvgw	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dvgw	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dvgw	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2242,8 +2463,8 @@
 +exec ec2-cmd DescribeVpnGateways "$@"
 
 === modified file 'bin/ec2dvol'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dvol	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dvol	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dvol	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2dvol	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2259,8 +2480,8 @@
 +exec ec2-cmd DescribeVolumes "$@"
 
 === modified file 'bin/ec2dvpc'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dvpc	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dvpc	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dvpc	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dvpc	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2276,8 +2497,8 @@
 +exec ec2-cmd DescribeVpcs "$@"
 
 === modified file 'bin/ec2dvpn'
---- ec2-api-tools-1.3.42584.orig/bin/ec2dvpn	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2dvpn	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2dvpn	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2dvpn	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2293,8 +2514,8 @@
 +exec ec2-cmd DescribeVpnConnections "$@"
 
 === modified file 'bin/ec2fp'
---- ec2-api-tools-1.3.42584.orig/bin/ec2fp	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2fp	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2fp	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2fp	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2310,8 +2531,8 @@
 +exec ec2-cmd FingerprintKey "$@"
 
 === modified file 'bin/ec2gcons'
---- ec2-api-tools-1.3.42584.orig/bin/ec2gcons	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2gcons	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2gcons	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2gcons	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2327,8 +2548,8 @@
 +exec ec2-cmd GetConsoleOutput "$@"
 
 === modified file 'bin/ec2gpass'
---- ec2-api-tools-1.3.42584.orig/bin/ec2gpass	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2gpass	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2gpass	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2gpass	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2344,8 +2565,8 @@
 +exec ec2-cmd GetPassword "$@"
 
 === modified file 'bin/ec2kill'
---- ec2-api-tools-1.3.42584.orig/bin/ec2kill	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2kill	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2kill	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2kill	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2361,8 +2582,8 @@
 +exec ec2-cmd TerminateInstances "$@"
 
 === modified file 'bin/ec2matt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2matt	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2matt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2matt	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2matt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2378,8 +2599,8 @@
 +exec ec2-cmd ModifyImageAttribute "$@"
 
 === modified file 'bin/ec2miatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2miatt	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2miatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2miatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2miatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2395,8 +2616,8 @@
 +exec ec2-cmd ModifyInstanceAttribute "$@"
 
 === modified file 'bin/ec2mim'
---- ec2-api-tools-1.3.42584.orig/bin/ec2mim	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2mim	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2mim	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2mim	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2412,8 +2633,8 @@
 +exec ec2-cmd MigrateBundle "$@"
 
 === modified file 'bin/ec2mimatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2mimatt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2mimatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2mimatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2mimatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2429,8 +2650,8 @@
 +exec ec2-cmd ModifyImageAttribute "$@"
 
 === modified file 'bin/ec2min'
---- ec2-api-tools-1.3.42584.orig/bin/ec2min	2009-06-01 20:19:17 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2min	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2min	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2min	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2446,8 +2667,8 @@
 +exec ec2-cmd MonitorInstances "$@"
 
 === modified file 'bin/ec2minatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2minatt	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2minatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2minatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2minatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2463,8 +2684,8 @@
 +exec ec2-cmd ModifyInstanceAttribute "$@"
 
 === modified file 'bin/ec2msnapatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2msnapatt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2msnapatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2msnapatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2msnapatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2480,8 +2701,8 @@
 +exec ec2-cmd ModifySnapshotAttribute "$@"
 
 === modified file 'bin/ec2prio'
---- ec2-api-tools-1.3.42584.orig/bin/ec2prio	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2prio	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2prio	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2prio	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2497,8 +2718,8 @@
 +exec ec2-cmd PurchaseReservedInstancesOffering "$@"
 
 === modified file 'bin/ec2ratt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2ratt	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2ratt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2ratt	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2ratt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2514,8 +2735,8 @@
 +exec ec2-cmd ResetImageAttribute "$@"
 
 === modified file 'bin/ec2reboot'
---- ec2-api-tools-1.3.42584.orig/bin/ec2reboot	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2reboot	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2reboot	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2reboot	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2531,8 +2752,8 @@
 +exec ec2-cmd RebootInstances "$@"
 
 === modified file 'bin/ec2reg'
---- ec2-api-tools-1.3.42584.orig/bin/ec2reg	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2reg	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2reg	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2reg	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2548,8 +2769,8 @@
 +exec ec2-cmd RegisterImage "$@"
 
 === modified file 'bin/ec2reladdr'
---- ec2-api-tools-1.3.42584.orig/bin/ec2reladdr	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2reladdr	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2reladdr	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2reladdr	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2565,8 +2786,8 @@
 +exec ec2-cmd ReleaseAddress "$@"
 
 === modified file 'bin/ec2revoke'
---- ec2-api-tools-1.3.42584.orig/bin/ec2revoke	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2revoke	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2revoke	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2revoke	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2582,8 +2803,8 @@
 +exec ec2-cmd RevokeGroup "$@"
 
 === modified file 'bin/ec2riatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2riatt	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2riatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2riatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2riatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2599,8 +2820,8 @@
 +exec ec2-cmd ResetInstanceAttribute "$@"
 
 === modified file 'bin/ec2rimatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2rimatt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2rimatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2rimatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2rimatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2616,8 +2837,8 @@
 +exec ec2-cmd ResetImageAttribute "$@"
 
 === modified file 'bin/ec2rinatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2rinatt	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2rinatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2rinatt	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2rinatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2632,9 +2853,26 @@
 -$EC2_HOME/bin/ec2-cmd ResetInstanceAttribute "$@"
 +exec ec2-cmd ResetInstanceAttribute "$@"
 
+=== modified file 'bin/ec2rsi'
+--- ec2-api-tools.orig/bin/ec2rsi	2009-12-15 20:03:54 +0000
++++ ec2-api-tools.pkg/bin/ec2rsi	2009-12-15 20:18:26 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2006-2009 Amazon.com, Inc. or its affiliates.  All Rights Reserved.  Licensed under the
+ # Amazon Software License (the "License").  You may not use this file except in compliance with the License. A copy of the
+@@ -6,5 +6,4 @@
+ # IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-EC2_HOME=${EC2_HOME:?EC2_HOME is not set}
+-$EC2_HOME/bin/ec2-cmd RequestSpotInstances "$@"
++exec ec2-cmd RequestSpotInstances "$@"
+
 === modified file 'bin/ec2rsnapatt'
---- ec2-api-tools-1.3.42584.orig/bin/ec2rsnapatt	2009-11-17 10:02:53 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2rsnapatt	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2rsnapatt	2009-11-17 10:02:53 +0000
++++ ec2-api-tools.pkg/bin/ec2rsnapatt	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2650,8 +2888,8 @@
 +exec ec2-cmd ResetSnapshotAttribute "$@"
 
 === modified file 'bin/ec2run'
---- ec2-api-tools-1.3.42584.orig/bin/ec2run	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2run	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2run	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2run	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2667,8 +2905,8 @@
 +exec ec2-cmd RunInstances "$@"
 
 === modified file 'bin/ec2start'
---- ec2-api-tools-1.3.42584.orig/bin/ec2start	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2start	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2start	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2start	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2684,8 +2922,8 @@
 +exec ec2-cmd StartInstances "$@"
 
 === modified file 'bin/ec2stop'
---- ec2-api-tools-1.3.42584.orig/bin/ec2stop	2009-12-07 19:33:15 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2stop	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2stop	2009-12-07 15:54:43 +0000
++++ ec2-api-tools.pkg/bin/ec2stop	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2701,8 +2939,8 @@
 +exec ec2-cmd StopInstances "$@"
 
 === modified file 'bin/ec2umin'
---- ec2-api-tools-1.3.42584.orig/bin/ec2umin	2009-06-01 20:19:17 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2umin	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2umin	2009-06-01 20:19:17 +0000
++++ ec2-api-tools.pkg/bin/ec2umin	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
@@ -2718,8 +2956,8 @@
 +exec ec2-cmd UnmonitorInstances "$@"
 
 === modified file 'bin/ec2ver'
---- ec2-api-tools-1.3.42584.orig/bin/ec2ver	2009-03-18 09:03:37 +0000
-+++ ec2-api-tools-1.3.42584/bin/ec2ver	2009-12-07 19:53:33 +0000
+--- ec2-api-tools.orig/bin/ec2ver	2009-03-18 09:03:37 +0000
++++ ec2-api-tools.pkg/bin/ec2ver	2009-12-15 20:18:26 +0000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
diff -Nru /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/debian/rules /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/debian/rules
--- ec2-api-tools-1.3.45772/debian/rules	2009-12-15 21:00:38.000000000 +0000
+++ ec2-api-tools-1.3.46266/debian/rules	2009-12-15 21:00:39.000000000 +0000
@@ -3,6 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-install/ec2-api-tools::
+binary-post-install/ec2-api-tools::
 	# we need no stinking windows batch scripts
 	rm  -f debian/ec2-api-tools/usr/bin/*.cmd
Binary files /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/lib/ec2-api-tools.jar and /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/lib/ec2-api-tools.jar differ
Binary files /tmp/PRMp3BZTIX/ec2-api-tools-1.3.45772/lib/ec2-java-client.jar and /tmp/WfwyHLmrWT/ec2-api-tools-1.3.46266/lib/ec2-java-client.jar differ