From 14ee9c33ae9ab73fd550a15b248743f09767e724 Mon Sep 17 00:00:00 2001 From: Kurt Aschliman Date: Mon, 5 May 2014 15:36:54 -0500 Subject: [PATCH 1/5] Add ability to pass order to rc fragments --- manifests/rc.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/rc.pp b/manifests/rc.pp index f657f97..f611e93 100644 --- a/manifests/rc.pp +++ b/manifests/rc.pp @@ -1,4 +1,4 @@ -define vim::rc ($content='') +define vim::rc ($content='', $order = '100') { validate_string($content) @@ -10,5 +10,6 @@ concat::fragment { "vimrc-${name}": target => 'vimrc', content => "${real_content}\n", + order => $order, } } From a43cfe298803c3c6d648b399855a9e9ec905b815 Mon Sep 17 00:00:00 2001 From: Kurt Aschliman Date: Mon, 5 May 2014 16:08:23 -0500 Subject: [PATCH 2/5] Make pathogen load earlier in vimrc --- manifests/init.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/init.pp b/manifests/init.pp index 626de8e..eba9315 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -58,6 +58,7 @@ vim::rc { 'vimrc-pathogen': content => "execute pathogen#infect()\ncall pathogen#helptags()", + order => 1, } vim::rc { 'vimrc-local': From 1b62cf6161aa570bc4022c6520f18eb68fa0b8ac Mon Sep 17 00:00:00 2001 From: Kurt Aschliman Date: Mon, 5 May 2014 16:25:47 -0500 Subject: [PATCH 3/5] Change order to 10 --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index eba9315..6e41f2c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -58,7 +58,7 @@ vim::rc { 'vimrc-pathogen': content => "execute pathogen#infect()\ncall pathogen#helptags()", - order => 1, + order => '10', } vim::rc { 'vimrc-local': From 363bc877fcf66e06625fa16d102c537b0a574edd Mon Sep 17 00:00:00 2001 From: Kurt Aschliman Date: Mon, 5 May 2014 17:09:31 -0500 Subject: [PATCH 4/5] Update default order --- manifests/rc.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/rc.pp b/manifests/rc.pp index f611e93..f9b7170 100644 --- a/manifests/rc.pp +++ b/manifests/rc.pp @@ -1,4 +1,4 @@ -define vim::rc ($content='', $order = '100') +define vim::rc ($content='', $order = 75) { validate_string($content) From 6838d261fbe214bce86268b7725f1abe4578da99 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 30 Oct 2015 21:49:25 -0400 Subject: [PATCH 5/5] lint --- manifests/init.pp | 2 +- manifests/rc.pp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 6e41f2c..2d79abe 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -58,7 +58,7 @@ vim::rc { 'vimrc-pathogen': content => "execute pathogen#infect()\ncall pathogen#helptags()", - order => '10', + order => '10', } vim::rc { 'vimrc-local': diff --git a/manifests/rc.pp b/manifests/rc.pp index f9b7170..c2b07f8 100644 --- a/manifests/rc.pp +++ b/manifests/rc.pp @@ -1,4 +1,4 @@ -define vim::rc ($content='', $order = 75) +define vim::rc ($content='', $order=75) { validate_string($content) @@ -8,8 +8,8 @@ } concat::fragment { "vimrc-${name}": - target => 'vimrc', - content => "${real_content}\n", - order => $order, + target => 'vimrc', + content => "${real_content}\n", + order => $order, } }