refactor(tpldir): use topdir globally in place of tpldir

* `topdir` evaluates to the formula's root directory * Maintains formula's portability by providing consistent navigation
saltstack-formulas · Feb 28, 2019 · 2838bc9 · 2838bc9
1 parent 422c7ac
commit 2838bc9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/template/pkg/clean.sls b/template/pkg/clean.sls
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
+{#- Get the `topdir` from `tpldir` #}
+{%- set topdir = tpldir.split('/')[0] %}
+{%- from topdir ~ "/map.jinja" import template with context %}
 
 template-service-dead:
   service.dead:

diff --git a/template/pkg/config.sls b/template/pkg/config.sls
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
+{#- Get the `topdir` from `tpldir` #}
 {%- set topdir = tpldir.split('/')[0] %}
-{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
-{%- from salt['file.dirname'](tpldir) ~ "/macros.jinja" import files_switch with context %}
+{%- from topdir ~ "/map.jinja" import template with context %}
+{%- from topdir ~ "/macros.jinja" import files_switch with context %}
 
 include:
   - .install

diff --git a/template/pkg/install.sls b/template/pkg/install.sls
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
+{#- Get the `topdir` from `tpldir` #}
+{%- set topdir = tpldir.split('/')[0] %}
+{%- from topdir ~ "/map.jinja" import template with context %}
 
 template-pkg:
   pkg.installed:

diff --git a/template/pkg/service.sls b/template/pkg/service.sls
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{%- from salt['file.dirname'](tpldir) ~ "/map.jinja" import template with context %}
+{#- Get the `topdir` from `tpldir` #}
+{%- set topdir = tpldir.split('/')[0] %}
+{%- from topdir ~ "/map.jinja" import template with context %}
 
 include:
   - .config