[tor-commits] [stem/master] Renaming 'prompt' to 'tor-prompt'

[atagar@xxxxxxxxxxxxxx]

commit ffc1f706920fac1dec61c1aedf19028bac0057f5
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date:   Thu May 22 09:04:58 2014 -0700

    Renaming 'prompt' to 'tor-prompt'
    
    Renaming our prompt to be less generic so we can add it to bin on installation.
    I'm not in love with this name, but at least it's pretty self-explanatory.
---
 prompt     |    8 --------
 setup.py   |   26 +++++++++++++++-----------
 tor-prompt |    8 ++++++++
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/prompt b/prompt
deleted file mode 100755
index fc115a3..0000000
--- a/prompt
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2014, Damian Johnson and The Tor Project
-# See LICENSE for licensing information
-
-import stem.interpretor
-
-if __name__ == '__main__':
-  stem.interpretor.main()
diff --git a/setup.py b/setup.py
index 0aa8b00..47eb478 100644
--- a/setup.py
+++ b/setup.py
@@ -41,16 +41,20 @@ try:
 except ImportError:
   from distutils.command.build_py import build_py
 
-setup(name = 'stem',
-      version = module_info['version'],
-      description = DESCRIPTION,
-      license = module_info['license'],
-      author = module_info['author'],
-      author_email = module_info['contact'],
-      url = module_info['url'],
-      packages = ['stem', 'stem.descriptor', 'stem.response', 'stem.util'],
-      provides = ['stem'],
-      cmdclass = {'build_py': build_py},
-      keywords = "tor onion controller",
+setup(
+  name = 'stem',
+  version = module_info['version'],
+  description = DESCRIPTION,
+  license = module_info['license'],
+  author = module_info['author'],
+  author_email = module_info['contact'],
+  url = module_info['url'],
+  packages = ['stem', 'stem.descriptor', 'stem.interpretor', 'stem.response', 'stem.util'],
+  provides = ['stem'],
+  cmdclass = {'build_py': build_py},
+  keywords = 'tor onion controller',
+  data_files = [
+    ('/usr/bin', ['tor-prompt'])
+  ],
 )
 
diff --git a/tor-prompt b/tor-prompt
new file mode 100755
index 0000000..fc115a3
--- /dev/null
+++ b/tor-prompt
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+# Copyright 2014, Damian Johnson and The Tor Project
+# See LICENSE for licensing information
+
+import stem.interpretor
+
+if __name__ == '__main__':
+  stem.interpretor.main()



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits