diff --git a/.appveyor.yml b/.appveyor.yml
index 05eb805..04b81d8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -33,18 +33,8 @@ init:
 
 install:
 - cd ..
-- git clone --depth=1 -b master https://github.com/openframeworks/openFrameworks
-- git clone --depth=1 -b of-master-patch https://github.com/kr15h/ofxJSON openFrameworks\addons\ofxJSON 
+- git clone --depth=1 --branch=master https://github.com/openframeworks/openFrameworks
 - call openFrameworks\scripts\ci\addons\install.cmd
-- cd %OF_PATH%\addons\%APPVEYOR_PROJECT_NAME%
-- move /y example_basic/addons.make.norpi example_basic/addons.make
-- move /y example_camera/addons.make.norpi example_camera/addons.make
-- move /y example_fbo-sources/addons.make.norpi example_fbo-sources/addons.make
-- move /y example_pocketvj/addons.make.norpi example_pocketvj/addons.make
-- move /y example_remote-client/addons.make.norpi example_remote-client/addons.make
-- move /y example_remote-server/addons.make.norpi example_remote-server/addons.make
-- move /y example_simpler/addons.make.norpi example_simpler/addons.make
-- rd /s example_gamepad
 
 build_script:
 - cd %OF_PATH%
diff --git a/scripts/ci/msys2/install.sh b/scripts/ci/msys2/install.sh
new file mode 100644
index 0000000..27baeb1
--- /dev/null
+++ b/scripts/ci/msys2/install.sh
@@ -0,0 +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
diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh
new file mode 100644
index 0000000..27baeb1
--- /dev/null
+++ b/scripts/ci/vs/install.sh
@@ -0,0 +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