From b8019557a0a6f50e6a83043fe5977419c67c7b67 Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Wed, 2 Sep 2015 01:43:18 -0400 Subject: [PATCH 1/5] Pass Github Token to the composer.sh install script --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 5b34ccfe..532f4b4d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -320,7 +320,7 @@ Vagrant.configure("2") do |config| # Provision Composer # You may pass a github auth token as the first argument - # config.vm.provision "shell", path: "#{github_url}/scripts/composer.sh", privileged: false, args: ["", composer_packages.join(" ")] + # config.vm.provision "shell", path: "#{github_url}/scripts/composer.sh", privileged: false, args: [github_pat, composer_packages.join(" ")] # Provision Laravel # config.vm.provision "shell", path: "#{github_url}/scripts/laravel.sh", privileged: false, args: [server_ip, laravel_root_folder, public_folder, laravel_version] From 7ac580aa762f85934c76d3c384a2ac36659f631c Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Wed, 2 Sep 2015 02:16:01 -0400 Subject: [PATCH 2/5] Change to be a string comparison for the $GITHUB_OAUTH token check for NULL due to $GITHUB_OAUTH being an alphanumeric hash --- scripts/composer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/composer.sh b/scripts/composer.sh index 28b6d83c..9d1a209e 100644 --- a/scripts/composer.sh +++ b/scripts/composer.sh @@ -54,7 +54,7 @@ else fi fi -if [[ $GITHUB_OAUTH -ne "" ]]; then +if [[ $GITHUB_OAUTH != "" ]]; then if [[ ! $COMPOSER_IS_INSTALLED -eq 1 ]]; then composer config -g github-oauth.github.com $GITHUB_OAUTH fi From 2806842cd183cefb94211cb145db60158f505aac Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Sat, 5 Sep 2015 12:42:09 -0400 Subject: [PATCH 3/5] Echo that we are setting the Github Personal Access Token --- scripts/composer.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/composer.sh b/scripts/composer.sh index 9d1a209e..8f8054ee 100644 --- a/scripts/composer.sh +++ b/scripts/composer.sh @@ -56,6 +56,7 @@ fi if [[ $GITHUB_OAUTH != "" ]]; then if [[ ! $COMPOSER_IS_INSTALLED -eq 1 ]]; then + echo ">>> Setting Github Personal Access Token" composer config -g github-oauth.github.com $GITHUB_OAUTH fi fi From 111beb64ea4f4c164fd957973dfa918755f51245 Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Sat, 5 Sep 2015 13:19:58 -0400 Subject: [PATCH 4/5] Add token to the output of setting the token to make it more explicit that it is set correctly --- scripts/composer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/composer.sh b/scripts/composer.sh index 8f8054ee..da86e543 100644 --- a/scripts/composer.sh +++ b/scripts/composer.sh @@ -56,7 +56,7 @@ fi if [[ $GITHUB_OAUTH != "" ]]; then if [[ ! $COMPOSER_IS_INSTALLED -eq 1 ]]; then - echo ">>> Setting Github Personal Access Token" + echo ">>> Setting Github Personal Access Token: $GITHUB_OAUTH" composer config -g github-oauth.github.com $GITHUB_OAUTH fi fi From ec6dda072dbda52543b1e898a8d9d1d833a9079b Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Thu, 15 Oct 2015 10:23:02 -0400 Subject: [PATCH 5/5] Revert "Add token to the output of setting the token to make it more explicit that it is set correctly" This reverts commit 111beb64ea4f4c164fd957973dfa918755f51245. --- scripts/composer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/composer.sh b/scripts/composer.sh index da86e543..8f8054ee 100644 --- a/scripts/composer.sh +++ b/scripts/composer.sh @@ -56,7 +56,7 @@ fi if [[ $GITHUB_OAUTH != "" ]]; then if [[ ! $COMPOSER_IS_INSTALLED -eq 1 ]]; then - echo ">>> Setting Github Personal Access Token: $GITHUB_OAUTH" + echo ">>> Setting Github Personal Access Token" composer config -g github-oauth.github.com $GITHUB_OAUTH fi fi