From bb05314dc190559bb15682c55ff34d8d301e68fb Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 6 May 2018 19:08:42 +0200 Subject: [PATCH] Checkout ofxOMXPlayer 0.9.0-compatible in travis git cfg --- scripts/ci/rpi/mkimage.sh | 11 ++++++----- scripts/ci/rpi/pisetup.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/ci/rpi/mkimage.sh b/scripts/ci/rpi/mkimage.sh index 8af7518..d0e7b6a 100644 --- a/scripts/ci/rpi/mkimage.sh +++ b/scripts/ci/rpi/mkimage.sh @@ -76,11 +76,12 @@ cp "${MOUNT}/etc/ld.so.preload" "${MOUNT}/etc/_ld.so.preload" echo "" > "${MOUNT}/etc/ld.so.preload" # git clone addons -git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git /home/pi/openFrameworks/addons/ofxJSON -git clone -b 0.9.0-compatible https://github.com/jvcleave/ofxOMXPlayer.git /home/pi/openFrameworks/addons/ofxOMXPlayer - -#git clone https://github.com/kr15h/ofxOMXPlayerLite.git -#mv ofxOMXPlayerLite ofxOMXPlayer +git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git "${MOUNT}/home/pi/openFrameworks/addons/ofxJSON" +git clone https://github.com/jvcleave/ofxOMXPlayer.git "${MOUNT}/home/pi/openFrameworks/addons/ofxOMXPlayer" +CURRENT=$(pwd) +cd "${MOUNT}/home/pi/openFrameworks/addons/ofxOMXPlayer" +git checkout 0.9.0-compatible +cd "${CURRENT}" # copy ofxPiMapper to openFrameworks/addons mkdir "${MOUNT}/home/pi/openFrameworks/addons/ofxPiMapper" diff --git a/scripts/ci/rpi/pisetup.sh b/scripts/ci/rpi/pisetup.sh index 2956c24..2a9f901 100644 --- a/scripts/ci/rpi/pisetup.sh +++ b/scripts/ci/rpi/pisetup.sh @@ -18,4 +18,4 @@ echo "@reboot /home/pi/openFrameworks/addons/ofxPiMapper/example_basic/bin/examp crontab mycron rm mycron -echo "Done!" +echo "RPi setup done!"