Fixed conflict in install.sh

php_fix
xorrior 2018-03-02 09:13:56 -05:00
commit a853e0724a
2 changed files with 7 additions and 1 deletions

View File

@ -10,10 +10,14 @@ Feel free to join us on Slack! http://adaptiveempire.slack.com/
## Install ## Install
To install, run the `./setup/install.sh` script or use the corresponding docker image `docker pull empireproject/empire`. To install, run `sudo ./setup/install.sh` script or use the corresponding docker image `docker pull empireproject/empire`.
There's also a [quickstart here](http://www.powershellempire.com/?page_id=110) and full [documentation here](http://www.powershellempire.com/?page_id=83). There's also a [quickstart here](http://www.powershellempire.com/?page_id=110) and full [documentation here](http://www.powershellempire.com/?page_id=83).
## Quickstart
Check out the [Empire wiki](https://github.com/EmpireProject/Empire/wiki/Quickstart) for instructions on getting started with Empire.
## Contribution Rules ## Contribution Rules
Contributions are more than welcome! The more people who contribute to the project the better Empire will be for everyone. Below are a few guidelines for submitting contributions. Contributions are more than welcome! The more people who contribute to the project the better Empire will be for everyone. Below are a few guidelines for submitting contributions.

2
empire
View File

@ -727,6 +727,8 @@ def start_restful_api(empireMenu, suppress=False, username=None, password=None,
listenerObject = main.listeners.loadedListeners[listener_type] listenerObject = main.listeners.loadedListeners[listener_type]
# set all passed options # set all passed options
for option, values in request.json.iteritems(): for option, values in request.json.iteritems():
if type(values) == unicode:
values = values.encode('utf8')
if option == "Name": if option == "Name":
listenerName = values listenerName = values