Revert "Use console wrappers instead of our own commands"

Author: kyleknap

awscli/__init__.py

@@ -19,16 +19,6 @@
 
 __version__ = '1.11.82'
 
-
-#
-# Account for LC_CTYPE of UTF-8
-# For more information see:
-#   * http://bugs.python.org/issue18378
-#   * #945
-#
-if os.environ.get('LC_CTYPE', '') == 'UTF-8':
-    os.environ['LC_CTYPE'] = 'en_US.UTF-8'
-
 #
 # Get our data path to be added to botocore's search path
 #

bin/aws

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# Copyright 2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+# Licensed under the Apache License, Version 2.0 (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/apache2.0/
+
+# 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.
+import sys
+import os
+
+if os.environ.get('LC_CTYPE', '') == 'UTF-8':
+    os.environ['LC_CTYPE'] = 'en_US.UTF-8'
+import awscli.clidriver
+
+
+def main():
+    return awscli.clidriver.main()
+
+
+if __name__ == '__main__':
+    sys.exit(main())

bin/aws.cmd

@@ -0,0 +1,59 @@
+@echo OFF
+REM="""
+setlocal
+set PythonExe=""
+set PythonExeFlags=
+
+for %%i in (cmd bat exe) do (
+    for %%j in (python.%%i) do (
+        call :SetPythonExe "%%~$PATH:j"
+    )
+)
+for /f "tokens=2 delims==" %%i in ('assoc .py') do (
+    for /f "tokens=2 delims==" %%j in ('ftype %%i') do (
+        for /f "tokens=1" %%k in ("%%j") do (
+            call :SetPythonExe %%k
+        )
+    )
+)
+%PythonExe% -x %PythonExeFlags% "%~f0" %*
+exit /B %ERRORLEVEL%
+goto :EOF
+
+:SetPythonExe
+if not ["%~1"]==[""] (
+    if [%PythonExe%]==[""] (
+        set PythonExe="%~1"
+    )
+)
+goto :EOF
+"""
+
+# ===================================================
+# Python script starts here
+# ===================================================
+
+#!/usr/bin/env python
+# Copyright 2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+# Licensed under the Apache License, Version 2.0 (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/apache2.0/
+
+# 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.
+
+import awscli.clidriver
+import sys
+
+
+def main():
+    return awscli.clidriver.main()
+
+
+if __name__ == '__main__':
+    sys.exit(main())

setup.py

@@ -44,13 +44,13 @@ def find_version(*file_paths):
     long_description=open('README.rst').read(),
     author='Amazon Web Services',
     url='http://aws.amazon.com/cli/',
-    scripts=['bin/aws_completer', 'bin/aws_zsh_completer.sh',
+    scripts=['bin/aws', 'bin/aws.cmd',
+             'bin/aws_completer', 'bin/aws_zsh_completer.sh',
              'bin/aws_bash_completer'],
     packages=find_packages(exclude=['tests*']),
     package_data={'awscli': ['data/*.json', 'examples/*/*.rst',
                              'examples/*/*/*.rst', 'topics/*.rst',
                              'topics/*.json']},
-    entry_points={"console_scripts": ["aws = awscli.clidriver:main"]},
     install_requires=requires,
     extras_require={
         ':python_version=="2.6"': [