Skip to content

Commit c57ef90

Browse files
committed
Updated install docs
Fixes knipknap#82.
1 parent 9158df5 commit c57ef90

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ python:
77
# - "3.4"
88
# command to install dependencies
99
install:
10-
- "pip install pycrypto"
11-
- "pip install 'paramiko<1.15'"
10+
- "pip install -r requirements.txt"
1211
- "pip install coveralls"
1312
# command to run tests
1413
script: cd tests/Exscript/; coverage run ./run_suite.py 1

INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Exscript Installation
22
----------------------
33

4-
1. Install python-crypto
5-
2. Install Exscript. For example, do this as root:
4+
Exscript can be installed easily using the Makefile.
5+
For example, do this as root:
66

77
sudo make install PREFIX=/usr/local
88

99

1010
Configuring the Exscript daemon
1111
--------------------------------
1212
Please refer to the PDF handbook for instructions on setting up
13-
the Exscript as a server.
13+
Exscript as a server.

README renamed to README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
= Exscript =
1+
Exscript
2+
========
23

34
Exscript is a Python module and a template processor for automating network
45
connections over protocols such as Telnet or SSH. We attempt to create the
@@ -18,12 +19,21 @@ but has some unique features that make it a lot easier to use and understand
1819
for non-developers.
1920

2021

21-
= Links =
22+
Links
23+
=====
2224

2325
Mailing List: http://groups.google.com/group/exscript/
2426

2527

26-
= Dependencies =
28+
Dependencies
29+
============
2730

28-
* Python 2.6 or greater
31+
* Python >=2.6 , <=2.7 (no Python 3 yet)
2932
* Python-crypto
33+
* Paramiko
34+
35+
36+
Installation
37+
============
38+
39+
Simply follow the [installation guide](https://github.com/knipknap/exscript/wiki/Installation-Guide "Installation Guide").

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pycrypto
2+
paramiko<1.15

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
'exscriptd',
3535
'exscriptd-config',
3636
'exclaim'],
37-
install_requires = ['paramiko'],
37+
install_requires = ['paramiko<1.15', 'pycrypto'],
3838
extras_require = {
3939
'Exscriptd': ['sqlalchemy', 'lxml'],
4040
'TkExscript': ['tkinter'],

0 commit comments

Comments
 (0)