From 163a249dd0540198076da7d624002e5f20b0241f Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 1 Apr 2018 11:10:00 +0200 Subject: [PATCH] Add absolute paths to tools in msys2 scripts --- scripts/ci/msys2/install.sh | 20 ++++++++++---------- scripts/ci/vs/install.sh | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/ci/msys2/install.sh b/scripts/ci/msys2/install.sh index 27baeb1..2d8b561 100644 --- a/scripts/ci/msys2/install.sh +++ b/scripts/ci/msys2/install.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash -- pwd -- git clone --depth=1 -b of-master-patch https://github.com/kr15h/ofxJSON addons/ofxJSON -- mv addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make -- rm -rf addons/%APPVEYOR_PROJECT_NAME%/example_gamepad +- /usr/bin/pwd +- /usr/bin/git clone --depth=1 -b of-master-patch https://github.com/kr15h/ofxJSON addons/ofxJSON +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make +- /usr/bin/rm -rf addons/%APPVEYOR_PROJECT_NAME%/example_gamepad diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh index 27baeb1..2d8b561 100644 --- a/scripts/ci/vs/install.sh +++ b/scripts/ci/vs/install.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash -- pwd -- git clone --depth=1 -b of-master-patch https://github.com/kr15h/ofxJSON addons/ofxJSON -- mv addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make -- mv addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make -- rm -rf addons/%APPVEYOR_PROJECT_NAME%/example_gamepad +- /usr/bin/pwd +- /usr/bin/git clone --depth=1 -b of-master-patch https://github.com/kr15h/ofxJSON addons/ofxJSON +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_basic/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_camera/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_fbo-sources/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_pocketvj/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-client/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_remote-server/addons.make +- /usr/bin/mv addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make.norpi addons/%APPVEYOR_PROJECT_NAME%/example_simpler/addons.make +- /usr/bin/rm -rf addons/%APPVEYOR_PROJECT_NAME%/example_gamepad