Use scripts to install pkgx and bundler

Makefile

@@ -13,19 +13,25 @@ archive-demo-tvos:
 	@Scripts/archive-demo.sh $(MODE) --platform tvos
 
 .PHONY: deliver-demo-nightly-ios
-deliver-demo-nightly-ios: install-pkgx install-bundler
+deliver-demo-nightly-ios:
+	@Scripts/install-pkgx.sh
+	@Scripts/install-bundler.sh
 	@echo "Delivering demo nightly build for iOS..."
 	@pkgx +magick +rsvg-convert bundle exec fastlane deliver_demo_nightly_ios
 	@echo "... done.\n"
 
 .PHONY: deliver-demo-nightly-tvos
-deliver-demo-nightly-tvos: install-pkgx install-bundler
+deliver-demo-nightly-tvos:
+	@Scripts/install-pkgx.sh
+	@Scripts/install-bundler.sh
 	@echo "Delivering demo nightly build for tvOS..."
 	@pkgx +magick +rsvg-convert bundle exec fastlane deliver_demo_nightly_tvos
 	@echo "... done.\n"
 
 .PHONY: deliver-demo-release-ios
-deliver-demo-release-ios: install-pkgx install-bundler
+deliver-demo-release-ios:
+	@Scripts/install-pkgx.sh
+	@Scripts/install-bundler.sh
 	@echo "Delivering demo release build for iOS..."
 	@pkgx bundle exec fastlane deliver_demo_release_ios
 	@echo "... done.\n"
@@ -49,15 +55,19 @@ test-streams-stop: install-pkgx
 	@echo "... done.\n"
 
 .PHONY: test-ios
-test-ios: install-pkgx install-bundler
+test-ios:
+	@Scripts/install-pkgx.sh
+	@Scripts/install-bundler.sh
 	@echo "Running unit tests..."
 	@Scripts/test-streams.sh -s
 	@pkgx bundle exec fastlane test_ios
 	@Scripts/test-streams.sh -k
 	@echo "... done.\n"
 
 .PHONY: test-tvos
-test-tvos: install-pkgx install-bundler
+test-tvos:
+	@Scripts/install-pkgx.sh
+	@Scripts/install-bundler.sh
 	@echo "Running unit tests..."
 	@Scripts/test-streams.sh -s
 	@pkgx bundle exec fastlane test_tvos