GoSecure · xshill · Mar 7, 2019 · Mar 7, 2019 · Mar 7, 2019 · Mar 7, 2019
diff --git a/Dockerfile b/Dockerfile
@@ -10,13 +10,12 @@ RUN apt-get update
 
 # Install Dependencies
 RUN apt-get install python3 python3-pip -y
-RUN apt-get install notify-osd dbus-x11 python3-pyqt4 -y
-RUN pip3 install --upgrade setuptools cryptography
+RUN apt-get install notify-osd dbus-x11 libdbus-1-dev libdbus-glib-1-dev -y
 
 COPY . /pyrdp
 
 RUN cd /pyrdp \
-    && python3 setup.py install
+    && pip3 install -e .
 
 # Create user
 RUN useradd --create-home --home-dir /home/pyrdp pyrdp 

diff --git a/README.md b/README.md
@@ -46,16 +46,16 @@ PyRDP should work on Python 3.6 and up.
 This tool has been tested to work on Python 3.6 on Linux (Ubuntu 18.04). It has not been tested on OSX and Windows.
 
 ## Installing
-First, make sure to update setuptools so the setup script won't break:
+First, make sure to install the prerequisite packages
 
 ```
-sudo pip3 install --upgrade setuptools
+sudo apt install libdbus-1-dev libdbus-glib-1-dev
 ```
 
-You can now install PyRDP by running the setup script:
+You can now install PyRDP by running the setup script with pip:
 
 ```
-sudo python3 setup.py install
+sudo pip3 install -e . 
 ```
 
 This should install all the dependencies required to run PyRDP.

diff --git a/pyrdp/__init__.py b/pyrdp/__init__.py
diff --git a/pyrdp/enum/virtual_channel/__init__.py b/pyrdp/enum/virtual_channel/__init__.py
diff --git a/pyrdp/layer/rdp/__init__.py b/pyrdp/layer/rdp/__init__.py
diff --git a/pyrdp/layer/rdp/virtual_channel/__init__.py b/pyrdp/layer/rdp/virtual_channel/__init__.py
diff --git a/pyrdp/parser/rdp/__init__.py b/pyrdp/parser/rdp/__init__.py
diff --git a/pyrdp/parser/rdp/virtual_channel/__init__.py b/pyrdp/parser/rdp/virtual_channel/__init__.py
diff --git a/pyrdp/pdu/rdp/__init__.py b/pyrdp/pdu/rdp/__init__.py
diff --git a/pyrdp/pdu/rdp/virtual_channel/__init__.py b/pyrdp/pdu/rdp/virtual_channel/__init__.py
diff --git a/setup.py b/setup.py
@@ -21,8 +21,11 @@
     ],
     install_requires=[
         'appdirs',
+        'cryptography',
+        'dbus-python',
         'names',
         'notify2',
+        'pyasn1',
         'pycrypto',
         'pyopenssl',
         'PySide2',