Update scripts for Linux

Fix release folder

Fix docker line

Fix dir status

Fix paths for build-linux script

Author: hoffmabc

.travis.yml

@@ -1,38 +1,28 @@
 language: python
 sudo: true
+os:
+  - linux
+  - osx
 python:
     - "2.7"
 services:
   - docker
 install:
-    - pip install --upgrade pip
-    - pip install -r requirements.txt
-    - pip install -r test_requirements.txt
-
-script:
-  - virtualenv virt64
-  - source virt64/bin/activate
+  - pip install --upgrade pip
   - pip install -r requirements.txt
-  - pip install -q pyinstaller==3.1
-  - pip install -q setuptools==19.2
-  - pip install -q cryptography
-  - pyinstaller -D -F .travis/openbazaard.linux64.spec
-  - "docker run -i -v \"${PWD}:/OpenBazaar\" toopher/ubuntu-i386:14.04 /bin/bash -c \"linux32 --32bit i386 /OpenBazaar/build.sh\""
-  - sudo bash build-win.sh
-  - sudo bash build-win64.sh
-  - sudo chmod 777 dist/openbazaard-linux32
-  - sudo chmod a+x dist/openbazaard-linux32
-  - sudo chmod a+x dist/openbazaard-linux64
-  - sudo chmod 777 dist/openbazaard.exe
+  - pip install -r test_requirements.txt
+script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash travis-linux.sh; fi
 after_success:
-    - coveralls
+  - coveralls
+before_deploy:
+  - export RELEASE_PKG_FILE=$(ls dist/openbazaard*)
 deploy:
   provider: releases
   api_key: "$GITHUB_TOKEN"
+  file_glob: true
   file:
-    - "dist/openbazaard-linux32"
-    - "dist/openbazaard-linux64"
-    - "dist/openbazaard.exe"
+    - "${RELEASE_PKG_FILE}"
     - "ob.cfg"
   skip_cleanup: true
   on:

build.sh renamed to build-linux32.sh

@@ -7,8 +7,6 @@ mkdir dist
 
 # case "$TRAVIS_OS_NAME" in
 #   "linux")
-
-   
     cd OpenBazaar/
 
     echo "Building Linux Binaries...."

build-linux64.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+virtualenv virt64
+source virt64/bin/activate
+pip install -r requirements.txt
+pip install -q pyinstaller==3.1
+pip install -q setuptools==19.2
+pip install -q cryptography
+pyinstaller -D -F .travis/openbazaard.linux64.spec

travis-linux.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+sudo bash build-linux64.sh
+sudo docker run -i -v "${PWD}:/OpenBazaar" toopher/ubuntu-i386:14.04 /bin/bash -c "linux32 --32bit i386 /OpenBazaar/build-linux32.sh"
+sudo bash build-win.sh
+sudo bash build-win64.sh
+sudo chmod 777 dist/openbazaard-linux32
+sudo chmod a+x dist/openbazaard-linux32
+sudo chmod 777 dist/openbazaard-linux64
+sudo chmod a+x dist/openbazaard-linux64
+ls -alg dist/openbazaard-linux64
+sudo chmod 777 dist/openbazaard.exe

travis-linux.sh~

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+sudo bash build-linux64.sh
+docker run -i -v "${PWD}:/OpenBazaar" toopher/ubuntu-i386:14.04 /bin/bash -c "linux32 --32bit i386 /OpenBazaar/build-linux32.sh"
+sudo bash build-win.sh
+sudo bash build-win64.sh
+sudo chmod 777 dist/openbazaard-linux32
+sudo chmod a+x dist/openbazaard-linux32
+sudo chmod 777 dist/openbazaard-linux64
+sudo chmod a+x dist/openbazaard-linux64
+ls -alg dist/openbazaard-linux64
+sudo chmod 777 dist/openbazaard.exe