Merge branch 'master' of https://github.com/AlessandroZ/LaZagne

peheaven · Apr 1, 2019 · 422cd6d · 422cd6d
2 parents 2c08b39 + 94f1405
commit 422cd6d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
+os: linux
 language: python
-os:
-- linux
 
 lint_steps: &lint_steps
   before_install:
@@ -14,6 +13,16 @@ matrix:
   include:
     - name: "Test and deploy on Python 2.7"
       python: '2.7'
+    - name: "Build on Python 2.7 on macOS"
+      os: osx
+      language: shell  # 'language: python' is not yet supported on Travis CI macOS
+      before_install:
+      - python -m pip install --upgrade pip
+      - pip install pyinstaller -r requirements.txt
+      script:
+       - pyinstaller --onefile Mac/laZagne.py
+       - ls -l dist  # See file size (4.8 mb), etc.
+       - dist/laZagne all
     - name: "Lint on Python 2.7"
       python: '2.7'
       <<: *lint_steps
@@ -23,20 +32,17 @@ matrix:
       <<: *lint_steps
 
 before_install:
-- pip install --upgrade pip
 - sudo add-apt-repository ppa:ubuntu-wine/ppa -y
 - sudo apt-get update -qq
 - sudo apt-get install -qq wine
-- wget https://www.python.org/ftp/python/2.7.9/python-2.7.9.amd64.msi --output-document=python.msi
+- wget https://www.python.org/ftp/python/2.7.16/python-2.7.16.amd64.msi --output-document=python.msi
 - wine msiexec /i python.msi /qn
 - wget https://files.pythonhosted.org/packages/83/cc/2e39fa39b804f7b6e768a37657d75eb14cd917d1f43f376dad9f7c366ccf/pywin32-224-cp27-cp27m-win_amd64.whl --output-document=pywin32-224-cp27-none-win_amd64.whl
 - wine c:\\Python27\\python.exe -m pip install pywin32-224-cp27-none-win_amd64.whl
-- wine c:\\Python27\\python.exe -m pip install pyasn1
-- wine c:\\Python27\\python.exe -m pip install enum34
-- wine c:\\Python27\\python.exe -m pip install rsa
-- wine c:\\Python27\\python.exe -m pip install https://github.com/AlessandroZ/pypykatz/archive/master.zip
-- wine c:\\Python27\\python.exe -m pip install pyinstaller
+- wine c:\\Python27\\python.exe -m pip install pyinstaller -r requirements.txt
 - wine c:\\Python27\\Scripts\\pyinstaller --noconsole --onefile Windows/lazagne.spec
+- ls -l dist  # See file size (4.8 mb), etc.
+install: true  # do not repeat `pip install -r requirements.txt`
 script:
 - wine Z:\\home\\travis\\build\\AlessandroZ\\LaZagne\\dist\\laZagne.exe all
 before_deploy:

diff --git a/Linux/requirement.txt b/Linux/requirement.txt
diff --git a/Mac/requirement.txt b/Mac/requirement.txt
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Installation
 ----
 Requirements are available here: https://github.com/AlessandroZ/LaZagne/wiki/Requirements
 ```
-pip install -r requirement.txt
+pip install -r requirements.txt
 ```
 
 Usage

diff --git a/Windows/requirement.txt b/Windows/requirement.txt
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,6 @@
+enum34; python_version < '3.4' and sys_platform == 'win32'
+psutil; sys_platform == 'linux' or sys_platform == 'linux2'
+pyasn1
+rsa; sys_platform == 'win32'
+secretstorage; sys_platform == 'linux' or sys_platform == 'linux2'
+https://github.com/AlessandroZ/pypykatz/archive/master.zip; sys_platform == 'win32'  # should point to pypykatz if my PR is approved
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ Installation @@
     ----
     Requirements are available here: https://github.com/AlessandroZ/LaZagne/wiki/Requirements
     ```
-    pip install -r requirement.txt
+    pip install -r requirements.txt
     ```
     Usage
@@ Expand Down @@