aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMelody Horn <melody@boringcactus.com>2019-02-26 23:43:31 -0700
committerMelody Horn <melody@boringcactus.com>2019-02-26 23:43:31 -0700
commit4b33474f210650c033eba42364b08fa8fd21dc4e (patch)
treee4f9c4dc3522e4e8dd4f56b376aa70bcd014fe70
parent7d8919bf80442b2fe88735c8675b5f243c5272b9 (diff)
downloadvidslice-4b33474f210650c033eba42364b08fa8fd21dc4e.tar.gz
vidslice-4b33474f210650c033eba42364b08fa8fd21dc4e.zip
why is this so hard
-rw-r--r--.travis.yml1
-rw-r--r--scripts/setup_linux.sh4
-rw-r--r--scripts/setup_osx.sh2
-rw-r--r--scripts/setup_windows.sh6
4 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index e8d47a1..9f1a763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ addons:
before_install:
- chmod +x scripts/setup_${TRAVIS_OS_NAME}.sh
- . scripts/setup_${TRAVIS_OS_NAME}.sh
- - set +x
install:
- which python3 && export PYTHON=python3 || export PYTHON=python
- echo ${PYTHON}
diff --git a/scripts/setup_linux.sh b/scripts/setup_linux.sh
index da62cf3..77f3a1d 100644
--- a/scripts/setup_linux.sh
+++ b/scripts/setup_linux.sh
@@ -3,4 +3,6 @@ set -x
sudo apt-get update
sudo apt-get install -y python3.5 python3.5-dev python3-pip libgtk2.0-dev libgtk-3-dev libjpeg-dev libtiff-dev libsdl1.2-dev libgstreamer-plugins-base0.10-dev libnotify-dev freeglut3 freeglut3-dev libsm-dev libwebkitgtk-dev libwebkitgtk-3.0-dev
-python3 -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/ wxPython==4.0.4
+sudo python3 -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04/ wxPython==4.0.4
+
+set +x
diff --git a/scripts/setup_osx.sh b/scripts/setup_osx.sh
index e88eeae..2dcd2b1 100644
--- a/scripts/setup_osx.sh
+++ b/scripts/setup_osx.sh
@@ -1,2 +1,4 @@
#!/usr/bin/env bash
set -x
+
+set +x
diff --git a/scripts/setup_windows.sh b/scripts/setup_windows.sh
index 75c700e..6883f27 100644
--- a/scripts/setup_windows.sh
+++ b/scripts/setup_windows.sh
@@ -7,5 +7,7 @@ echo $PATH
export PATH=/C/Python37:$PATH
which python
python get-pip.py
-curl https://download.lfd.uci.edu/pythonlibs/u2hcgva4/cx_Freeze-5.1.1-cp37-cp37m-win_amd64.whl -o cx_Freeze.whl
-python -m pip install cx_Freeze.whl
+curl https://download.lfd.uci.edu/pythonlibs/u2hcgva4/cx_Freeze-5.1.1-cp37-cp37m-win_amd64.whl -o cx_Freeze-5.1.1-cp37-cp37m-win_amd64.whl
+python -m pip install *.whl
+
+set +x