From 649f72c0f2af9a956b178d114ed54e484c1911eb Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 14 Jan 2015 15:17:09 +0100 Subject: [PATCH 1/6] Added modman installation --- bootstrap.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bootstrap.sh b/bootstrap.sh index 2276626..3840827 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -112,3 +112,9 @@ cd /vagrant/httpdocs wget https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar chmod +x ./n98-magerun.phar sudo mv ./n98-magerun.phar /usr/local/bin/ + +# Install modman +# -------------------- +wget "https://raw.github.com/colinmollenhour/modman/master/modman" +chmod +x ./modman +sudo mv ./modman /usr/local/bin/ From 191b5695086b445b81b99cd84930c6b13ab18f3e Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 14 Jan 2015 15:25:46 +0100 Subject: [PATCH 2/6] Enable "Allow Symlinks" for modman (found under System > Configuration > Advanced > Developer) via n98-magerun --- bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.sh b/bootstrap.sh index 3840827..e6f4a86 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -112,6 +112,7 @@ cd /vagrant/httpdocs wget https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar chmod +x ./n98-magerun.phar sudo mv ./n98-magerun.phar /usr/local/bin/ +n98-magerun.phar dev:symlinks --on --global # Install modman # -------------------- From 208e0b1bcf9c53effab9e10003061f35f758fbc7 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 14 Jan 2015 15:48:21 +0100 Subject: [PATCH 3/6] Install git for easier modman installations --- bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap.sh b/bootstrap.sh index e6f4a86..1f5029f 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -6,6 +6,8 @@ DATA_VERSION="1.9.0.0" # Install Apache & PHP # -------------------- +apt-get update -y +apt-get install -y git apt-get install -y apache2 apt-get install -y php5 apt-get install -y libapache2-mod-php5 From ddc540da87c0f087fefecf0f9b032e3e1cfd9bcc Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 11 Feb 2015 14:17:06 +0100 Subject: [PATCH 4/6] Correct URLs --- bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 1f5029f..933263a 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -111,13 +111,13 @@ fi # Install n98-magerun # -------------------- cd /vagrant/httpdocs -wget https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar +wget "https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar" chmod +x ./n98-magerun.phar sudo mv ./n98-magerun.phar /usr/local/bin/ n98-magerun.phar dev:symlinks --on --global # Install modman # -------------------- -wget "https://raw.github.com/colinmollenhour/modman/master/modman" +wget "https://raw.githubusercontent.com/colinmollenhour/modman/master/modman" chmod +x ./modman sudo mv ./modman /usr/local/bin/ From e2f1706bc70123180e24730544a2abbdadb03397 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 11 Feb 2015 14:19:21 +0100 Subject: [PATCH 5/6] No sudo necessary Vagrant runs provisioning scripts with sudo already --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 933263a..7c49202 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -97,7 +97,7 @@ fi # Run installer if [ ! -f "/vagrant/httpdocs/app/etc/local.xml" ]; then cd /vagrant/httpdocs - sudo /usr/bin/php -f install.php -- --license_agreement_accepted yes \ + /usr/bin/php -f install.php -- --license_agreement_accepted yes \ --locale en_US --timezone "America/Los_Angeles" --default_currency USD \ --db_host localhost --db_name magentodb --db_user magentouser --db_pass password \ --url "http://127.0.0.1:8080/" --use_rewrites yes \ @@ -113,11 +113,11 @@ fi cd /vagrant/httpdocs wget "https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar" chmod +x ./n98-magerun.phar -sudo mv ./n98-magerun.phar /usr/local/bin/ +mv ./n98-magerun.phar /usr/local/bin/ n98-magerun.phar dev:symlinks --on --global # Install modman # -------------------- wget "https://raw.githubusercontent.com/colinmollenhour/modman/master/modman" chmod +x ./modman -sudo mv ./modman /usr/local/bin/ +mv ./modman /usr/local/bin/ From 0b3be6e0d3b2b93d4319255e23e9897fc43f0208 Mon Sep 17 00:00:00 2001 From: Johannes Klein Date: Wed, 11 Feb 2015 14:23:14 +0100 Subject: [PATCH 6/6] bash-completion for modman and n98-modman makes working in terminal with both tools a lot more comfortable --- bootstrap.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 7c49202..e3f7fdb 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -108,16 +108,20 @@ if [ ! -f "/vagrant/httpdocs/app/etc/local.xml" ]; then /usr/bin/php -f shell/indexer.php reindexall fi -# Install n98-magerun +# Install n98-magerun and its bash-completion # -------------------- cd /vagrant/httpdocs wget "https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar" +wget "https://raw.githubusercontent.com/netz98/n98-magerun/master/autocompletion/bash/bash_complete" -O "magerun-bash-completion" chmod +x ./n98-magerun.phar mv ./n98-magerun.phar /usr/local/bin/ +mv ./magerun-bash-completion /etc/bash_completion.d/n98-magerun.phar n98-magerun.phar dev:symlinks --on --global -# Install modman +# Install modman and its bash-completion # -------------------- wget "https://raw.githubusercontent.com/colinmollenhour/modman/master/modman" +wget "https://raw.githubusercontent.com/colinmollenhour/modman/master/bash_completion" -O "modman-bash-completion" chmod +x ./modman mv ./modman /usr/local/bin/ +mv ./modman-bash-completion /etc/bash_completion.d/modman