Merge pull request #573 from inkstitch/lneva/stdout-encoding

fixes

1 files changed, 5 insertions, 5 deletions

diff --git a/bin/build-python b/bin/build-python
index c740c782..69058593 100755
--- a/bin/build-python
+++ b/bin/build-python
@@ -4,7 +4,7 @@ set -e
 
 site_packages="$(python -c "import os; print(os.path.dirname(os.__file__) + '/site-packages')")"
 
-if [ "$TRAVIS_OS_NAME" = "linux" -a "$BUILD" != "windows" ]; then
+if [ "$BUILD" = "linux" ]; then
     # pyinstaller misses these two
     pyinstaller_args+="--add-binary /usr/lib/x86_64-linux-gnu/gio/modules/libgiolibproxy.so:. "
     pyinstaller_args+="--add-binary  /usr/lib/x86_64-linux-gnu/libproxy.so.1:. "
@@ -24,7 +24,7 @@ pyinstaller_args+="--hidden-import wx "
 
 # We need to use the precompiled bootloader linked with graphical Mac OS X
 # libraries if we develop a GUI application for Mac:
-if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+if [ "$BUILD" = "osx" ]; then
     pyinstaller_args+="--windowed "
 fi
 
@@ -35,11 +35,11 @@ pyinstaller_args+="-p inkscape/share/extensions "
 pyinstaller_args+="--log-level DEBUG "
 
 if [ "$BUILD" = "windows" ]; then
-    wine c:\\Python\\scripts\\pyinstaller.exe $pyinstaller_args inkstitch.py
+    python -m PyInstaller $pyinstaller_args inkstitch.py
 else
     # without the LD_LIBRARY_PATH, it seems that pyinstaller can't find all of
     # wxpython's shared libraries
-    LD_LIBRARY_PATH="${site_packages}/wx" pyinstaller $pyinstaller_args --strip inkstitch.py;
+    LD_LIBRARY_PATH="${site_packages}/wx" python -m PyInstaller $pyinstaller_args --strip inkstitch.py;
 fi
 
 # pyinstaller put a whole mess of libraries under dist/inkstitch.  We'd like
@@ -52,7 +52,7 @@ mv dist/inkstitch/* dist/bin
 mv dist/bin dist/inkstitch
 
 # on Mac, pyinstaller creates a .app version as well, but we don't need that
-if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+if [ "$BUILD" = "osx" ]; then
     rm -rf dist/inkstitch.app/
 fi