Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Packaging work

  • Loading branch information...
commit 5a62b08ddd6f3b1adba2e12d4639b499615da7d5 1 parent 983cf0b
@BjarniRunar BjarniRunar authored
View
2  MANIFEST.in
@@ -1,2 +1,2 @@
include *.py *.md LICENSE BUGS
-recursive-include scripts
+recursive-include scripts *
View
10 Makefile
@@ -1,14 +1,14 @@
dist: .rpm .targz
-.targz: setup.py sockschain.py Makefile
+.targz: setup.py sockschain/__init__.py Makefile
@python setup.py sdist
@touch .targz
-.rpm: setup.py sockschain.py Makefile
- @sed -i -e 's/"SocksipyChain"/"python-socksipychain"/g' setup.py
+.rpm: setup.py sockschain/__init__.py Makefile
+ @sed -i -e 's/"Socks/"python-Socks/g' setup.py
@python setup.py bdist_rpm --install scripts/rpm-install.sh
- @sed -i -e 's/"python-socksipychain"/"SocksipyChain"/g' setup.py
+ @sed -i -e 's/"python-Socks/"Socks/g' setup.py
@touch .rpm
clean:
- @rm -rf .rpm .targz dist build MANIFEST
+ @rm -rf .rpm .targz dist build MANIFEST *.egg-info
View
10 setup.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-from distutils.core import setup
+from setuptools import setup
VERSION = "2.0.0"
@@ -16,7 +16,11 @@
author = "Bjarni R. Einarsson",
author_email="bre@pagekite.net",
license = "BSD",
- py_modules=["sockschain"],
- scripts=["sockschain.py"]
+ packages=["sockschain"],
+ entry_points = {
+ 'console_scripts': [
+ 'sockschain = sockschain:Main'
+ ]
+ }
)
View
2  sockschain.py → sockschain/__init__.py 100755 → 100644
@@ -1074,7 +1074,7 @@ def Main():
DebugPrint('Error: %s' % (sys.exc_info(), ))
sys.stderr.write(('Usage: %s '
'[<proto:proxy:port> [<proto:proxy:port> ...]] '
- '<host:port>\n') % sys.argv[0])
+ '<host:port>\n') % os.path.basename(sys.argv[0]))
sys.exit(1)
try:
Please sign in to comment.
Something went wrong with that request. Please try again.