Merge pull request #49 from lamerman/distutils-fix

Backward compatibility for distutils added to setup.py

Author: lamerman

example/allinone/test.spy

@@ -12,7 +12,7 @@ from common.common import common_func
 # iteration over command output
 for line in `ls -l`:
     # print of output with local variable capture
-    print `echo LINE IS: {line}
+    print `echo 'LINE IS: {line}'
 
 # return code capture
 s = `ls -l | grep non_existent_string

example/allinone/test3.spy

@@ -12,7 +12,7 @@ from common.common import common_func
 # iteration over command output
 for line in `ls -l`:
     # print of output with local variable capture
-    print(`echo LINE IS: {line}`)
+    print(`echo 'LINE IS: {line}'`)
 
 # return code capture
 s = `ls -l | grep non_existent_string

setup.py

@@ -2,9 +2,19 @@
 
 try:
     from setuptools import setup
+
+    args_for_setup = {'entry_points': {
+        'console_scripts': {
+            'shellpy = shellpython.shellpy:main'
+        }
+    }}
+
 except ImportError:
     from distutils.core import setup
 
+    args_for_setup = {'scripts': ['shellpy']}
+
+
 setup(name='shellpy',
       version='0.4.0',
       description='A convenient tool for shell scripting in python',
@@ -14,11 +24,7 @@
       download_url='https://github.com/lamerman/shellpy/tarball/0.4.0',
       keywords=['shell', 'bash', 'sh'],
       packages=['shellpython'],
-      entry_points = {
-        'console_scripts': {
-            'shellpy = shellpython.shellpy:main'
-        }
-      },
       package_data={'shellpython': ['*.tpl']},
-      install_requires=['colorama']
+      install_requires=['colorama'],
+      **args_for_setup
       )

shellpy

@@ -0,0 +1 @@
+shellpython/shellpy.py