move bin into release, update rtool

13 files changed, 29 insertions, 22 deletions

diff --git a/release/.env b/release/.env
deleted file mode 100644
index 69ac3f05..00000000
--- a/release/.env
+++ /dev/null
@@ -1,6 +0,0 @@
-DIR="$( dirname "${BASH_SOURCE[0]}" )"
-ACTIVATE_DIR="$(if [ -f "$DIR/../venv.mitmproxy/bin/activate" ]; then echo 'bin'; else echo 'Scripts'; fi;)"
-if [ -z "$VIRTUAL_ENV" ] && [ -f "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate" ]; then
-    echo "Activating mitmproxy virtualenv..."
-    source "$DIR/../venv.mitmproxy/$ACTIVATE_DIR/activate"
-fi
diff --git a/release/.gitignore b/release/.gitignore
deleted file mode 100644
index c062fb3b..00000000
--- a/release/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.DS_Store
-MANIFEST
-*.py[cdo]
-*.swp
-*.swo
-
-/build
-/dist
-/mitmproxy_rtool.egg-info
\ No newline at end of file
diff --git a/release/rtool.py b/release/rtool.py
index 936e64c8..2ebb3a1c 100644
--- a/release/rtool.py
+++ b/release/rtool.py
@@ -242,7 +242,7 @@ def bdist(ctx, use_existing_wheels, pyinstaller_version):
         if conf["tools"]:
             with Archive(join(DIST_DIR, archive_name(p))) as archive:
                 for tool in conf["tools"]:
-                    spec = join(RELEASE_DIR, "%s.spec" % tool)
+                    spec = join(RELEASE_DIR, "specs/%s.spec" % tool)
                     print("Building %s binary..." % tool)
                     subprocess.check_call(
                         [
diff --git a/release/specs/mitmdump b/release/specs/mitmdump
new file mode 100644
index 00000000..2483be4f
--- /dev/null
+++ b/release/specs/mitmdump
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from mitmproxy.main import mitmdump
+mitmdump()
diff --git a/release/mitmdump.spec b/release/specs/mitmdump.spec
index 967f5e58..149678df 100644
--- a/release/mitmdump.spec
+++ b/release/specs/mitmdump.spec
@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../mitmproxy/mitmdump'],
+a = Analysis(['mitmdump'],
              binaries=None,
              datas=collect_data_files("mitmproxy.onboarding"),
              hiddenimports=[],
diff --git a/release/specs/mitmproxy b/release/specs/mitmproxy
new file mode 100644
index 00000000..a3d7615d
--- /dev/null
+++ b/release/specs/mitmproxy
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from mitmproxy.main import mitmproxy
+mitmproxy()
diff --git a/release/mitmproxy.spec b/release/specs/mitmproxy.spec
index 6356b0a6..1c481446 100644
--- a/release/mitmproxy.spec
+++ b/release/specs/mitmproxy.spec
@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../mitmproxy/mitmproxy'],
+a = Analysis(['mitmproxy'],
              binaries=None,
              datas=collect_data_files("mitmproxy.onboarding"),
              hiddenimports=[],
diff --git a/release/specs/mitmweb b/release/specs/mitmweb
new file mode 100644
index 00000000..14188a33
--- /dev/null
+++ b/release/specs/mitmweb
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+from mitmproxy.main import mitmweb
+
+mitmweb()
diff --git a/release/mitmweb.spec b/release/specs/mitmweb.spec
index e3e634fa..79ccf71d 100644
--- a/release/mitmweb.spec
+++ b/release/specs/mitmweb.spec
@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../mitmproxy/mitmweb'],
+a = Analysis(['mitmweb'],
              binaries=None,
              datas=collect_data_files("mitmproxy"),
              hiddenimports=[],
diff --git a/release/specs/pathoc b/release/specs/pathoc
new file mode 100644
index 00000000..ab62d631
--- /dev/null
+++ b/release/specs/pathoc
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+from pathod import pathoc_cmdline as cmdline
+
+if __name__ == "__main__":
+    cmdline.go_pathoc()
diff --git a/release/pathoc.spec b/release/specs/pathoc.spec
index 707d21de..4f1f44be 100644
--- a/release/pathoc.spec
+++ b/release/specs/pathoc.spec
@@ -2,7 +2,7 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../pathod/pathoc'],
+a = Analysis(['pathoc'],
              binaries=None,
              datas=None,
              hiddenimports=['_cffi_backend'],
diff --git a/release/specs/pathod b/release/specs/pathod
new file mode 100644
index 00000000..af0c118b
--- /dev/null
+++ b/release/specs/pathod
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+from pathod import pathod_cmdline as cmdline
+
+if __name__ == "__main__":
+    cmdline.go_pathod()
diff --git a/release/pathod.spec b/release/specs/pathod.spec
index 4e515ac9..3d2a8be2 100644
--- a/release/pathod.spec
+++ b/release/specs/pathod.spec
@@ -2,9 +2,9 @@
 
 from PyInstaller.utils.hooks import collect_data_files
 
-a = Analysis(['../pathod/pathod'],
+a = Analysis(['pathod'],
              binaries=None,
-             datas=collect_data_files("libpathod"),
+             datas=collect_data_files("pathod"),
              hiddenimports=['_cffi_backend'],
              hookspath=None,
              runtime_hooks=None,