Skip to content

Commit 3a4bac4

Browse files
noelmcloughlinnoelmcloughlin
committed
fix(source_hash): remove unused 'source_hash' consant
1 parent 6feafa9 commit 3a4bac4

File tree

8 files changed

+97
-84
lines changed

8 files changed

+97
-84
lines changed

‎golang/config/alternatives/clean.sls

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
{%- set tplroot = tpldir.split('/')[0] %}
66
{%- from tplroot ~ "/map.jinja" import golang with context %}
77
{%- set sls_archive_clean = tplroot ~ '.archive.clean' %}
8-
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
8+
{%- set sls_package_clean = tplroot ~ '.package.clean' %}
99
1010
{%- if grains.kernel|lower == 'linux' and golang.linux.altpriority|int > 0 %}
1111
1212
include:
13-
- {{ sls_archive_clean }}
14-
13+
- {{ sls_archive_clean if golang.pkg.use_upstream_archive else sls_package_clean }}
1514
1615
golang-package-archive-remove-home-alternative-remove:
1716
alternatives.remove:
1817
- name: golang-home
1918
- path: {{ golang.base_dir }}/go
2019
- onlyif: update-alternatives --get-selections |grep ^golang-home
2120
- require:
22-
- sls: {{ sls_archive_clean }}
21+
- sls: {{ sls_archive_clean if golang.pkg.use_upstream_archive else sls_package_clean }}
2322
2423
{% for i in ['go', 'godoc', 'gofmt'] %}
2524
@@ -29,7 +28,7 @@ golang-package-archive-remove-{{ i }}-alternative-remove:
2928
- path: {{ golang.base_dir }}/go/bin/{{ i }}
3029
- onlyif: update-alternatives --get-selections |grep ^link-{{ i }}
3130
- require:
32-
- sls: {{ sls_archive_clean }}
31+
- sls: {{ sls_archive_clean if golang.pkg.use_upstream_archive else sls_package_clean }}
3332
3433
{% endfor %}
3534
{%- endif %}

‎golang/config/alternatives/init.sls

+1-66
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,5 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
33

4-
{#- Get the `tplroot` from `tpldir` #}
5-
{%- set tplroot = tpldir.split('/')[0] %}
6-
{%- from tplroot ~ "/map.jinja" import golang with context %}
7-
{%- set sls_archive_install = tplroot ~ '.archive.install' %}
8-
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
9-
10-
{%- if grains.kernel|lower == 'linux' and golang.linux.altpriority|int > 0 %}
11-
124
include:
13-
- {{ sls_archive_install }}
14-
15-
golang-package-archive-install-home-alternative-install:
16-
cmd.run:
17-
- name: update-alternatives --install {{ golang.go_root }} golang-home {{ golang.base_dir }}/go {{ golang.linux.altpriority }}
18-
- watch:
19-
- archive: golang-package-archive-install-archive-extracted
20-
- require:
21-
- sls: {{ sls_archive_install }}
22-
- onlyif: {{ grains.os_family in ('Suse',) }}
23-
alternatives.install:
24-
- name: golang-home
25-
- link: {{ golang.go_root }}
26-
- path: {{ golang.base_dir }}/go
27-
- priority: {{ golang.linux.altpriority }}
28-
- order: 10
29-
- watch:
30-
- archive: golang-package-archive-install-archive-extracted
31-
- unless: {{ grains.os_family in ('Suse',) }}
32-
- require:
33-
- sls: {{ sls_archive_install }}
34-
35-
golang-package-archive-install-home-alternative-set:
36-
alternatives.set:
37-
- name: golang-home
38-
- path: {{ golang.base_dir }}/go
39-
- require:
40-
- alternatives: golang-package-archive-install-home-alternative-install
41-
- unless: {{ grains.os_family in ('Suse',) }}
42-
43-
{% for i in ['go', 'godoc', 'gofmt'] %}
44-
45-
golang-package-archive-install-{{ i }}-alternative-install:
46-
cmd.run:
47-
- name: update-alternatives --install /usr/bin/{{i}} link-{{i}} {{ golang.base_dir }}/go/bin/{{i}} {{golang.linux.altpriority}}
48-
- require:
49-
- cmd: golang-package-archive-install-home-alternative-install
50-
- onlyif: {{ grains.os_family in ('Suse',) }}
51-
alternatives.install:
52-
- name: link-{{ i }}
53-
- link: /usr/bin/{{ i }}
54-
- path: {{ golang.base_dir }}/go/bin/{{ i }}
55-
- priority: {{ golang.linux.altpriority }}
56-
- order: 10
57-
- require:
58-
- alternatives: golang-package-archive-install-home-alternative-install
59-
- unless: {{ grains.os_family in ('Suse',) }}
60-
61-
golang-package-archive-install-{{ i }}-alternative-set:
62-
alternatives.set:
63-
- name: link-{{ i }}
64-
- path: {{ golang.base_dir }}/go/bin/{{ i }}
65-
- require:
66-
- alternatives: golang-package-archive-install-{{ i }}-alternative-install
67-
- unless: {{ grains.os_family in ('Suse',) }}
68-
69-
{% endfor %}
70-
{%- endif %}
5+
- .install

‎golang/config/alternatives/install.sls

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
{#- Get the `tplroot` from `tpldir` #}
5+
{%- set tplroot = tpldir.split('/')[0] %}
6+
{%- from tplroot ~ "/map.jinja" import golang with context %}
7+
{%- set sls_archive_install = tplroot ~ '.archive.install' %}
8+
{%- set sls_package_install = tplroot ~ '.package.install' %}
9+
10+
{%- if grains.kernel|lower == 'linux' and golang.linux.altpriority|int > 0 %}
11+
12+
include:
13+
- {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}
14+
15+
golang-package-archive-install-home-alternative-install:
16+
cmd.run:
17+
- name: update-alternatives --install {{ golang.go_root }} golang-home {{ golang.base_dir }}/go {{ golang.linux.altpriority }}
18+
- watch:
19+
- archive: golang-package-archive-install-archive-extracted
20+
- require:
21+
- sls: {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}
22+
- onlyif: {{ grains.os_family in ('Suse',) }}
23+
alternatives.install:
24+
- name: golang-home
25+
- link: {{ golang.go_root }}
26+
- path: {{ golang.base_dir }}/go
27+
- priority: {{ golang.linux.altpriority }}
28+
- order: 10
29+
- watch:
30+
- archive: golang-package-archive-install-archive-extracted
31+
- unless: {{ grains.os_family in ('Suse',) }}
32+
- require:
33+
- sls: {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}
34+
35+
golang-package-archive-install-home-alternative-set:
36+
alternatives.set:
37+
- name: golang-home
38+
- path: {{ golang.base_dir }}/go
39+
- require:
40+
- alternatives: golang-package-archive-install-home-alternative-install
41+
- unless: {{ grains.os_family in ('Suse',) }}
42+
43+
{% for i in ['go', 'godoc', 'gofmt'] %}
44+
45+
golang-package-archive-install-{{ i }}-alternative-install:
46+
cmd.run:
47+
- name: update-alternatives --install /usr/bin/{{i}} link-{{i}} {{ golang.base_dir }}/go/bin/{{i}} {{golang.linux.altpriority}}
48+
- require:
49+
- cmd: golang-package-archive-install-home-alternative-install
50+
- onlyif: {{ grains.os_family in ('Suse',) }}
51+
alternatives.install:
52+
- name: link-{{ i }}
53+
- link: /usr/bin/{{ i }}
54+
- path: {{ golang.base_dir }}/go/bin/{{ i }}
55+
- priority: {{ golang.linux.altpriority }}
56+
- order: 10
57+
- require:
58+
- alternatives: golang-package-archive-install-home-alternative-install
59+
- unless: {{ grains.os_family in ('Suse',) }}
60+
61+
golang-package-archive-install-{{ i }}-alternative-set:
62+
alternatives.set:
63+
- name: link-{{ i }}
64+
- path: {{ golang.base_dir }}/go/bin/{{ i }}
65+
- require:
66+
- alternatives: golang-package-archive-install-{{ i }}-alternative-install
67+
- unless: {{ grains.os_family in ('Suse',) }}
68+
69+
{% endfor %}
70+
{%- endif %}

‎golang/config/clean.sls

+12-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,22 @@
44
{#- Get the `tplroot` from `tpldir` #}
55
{%- set tplroot = tpldir.split('/')[0] %}
66
{%- from tplroot ~ "/map.jinja" import golang with context %}
7+
{%- set sls_archive_clean = tplroot ~ '.archive.clean' %}
8+
{%- set sls_package_clean = tplroot ~ '.package.clean' %}
9+
{%- set sls_alternatives_clean = tplroot ~ '.config.alternatives.clean' %}
10+
11+
{%- if grains.kernel|lower == 'linux' and golang.linux.altpriority|int > 0 %}
712
813
include:
9-
- {{ tplroot ~ '.config.alternatives.clean' }}
14+
- {{ sls_archive_clean if golang.pkg.use_upstream_archive else sls_package_clean }}
15+
- {{ sls_alternatives_clean }}
1016
1117
golang-config-clean-file-absent:
1218
file.absent:
1319
- names:
14-
- {{ golang.config }}
1520
- {{ golang.environ_file }}
21+
- require:
22+
- sls: {{ sls_archive_clean if golang.pkg.use_upstream_archive else sls_package_clean }}
23+
- sls: {{ sls_alternatives_clean }}
24+
25+
{%- endif %}

‎golang/config/environ.sls

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
{#- Get the `tplroot` from `tpldir` #}
55
{%- set tplroot = tpldir.split('/')[0] %}
66
{%- set sls_archive_install = tplroot ~ '.archive.install' %}
7+
{%- set sls_package_install = tplroot ~ '.package.install' %}
78
{%- from tplroot ~ "/map.jinja" import golang with context %}
89
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}
910
1011
include:
11-
- {{ sls_archive_install }}
12+
- {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}
1213
1314
golang-config-file-managed-environ_file:
1415
file.managed:
@@ -25,4 +26,4 @@ golang-config-file-managed-environ_file:
2526
- context:
2627
golang: {{ golang|json }}
2728
- require:
28-
- sls: {{ sls_archive_install }}
29+
- sls: {{ sls_archive_install if golang.pkg.use_upstream_archive else sls_package_install }}

‎golang/defaults.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# vim: ft=yaml
33
---
44
golang:
5-
go_root: /usr/local/go
5+
dir: /usr/local/go
66
go_path: /usr/local/golang/packages
77
version: '1.10.1'
88
pkg:
@@ -15,7 +15,8 @@ golang:
1515
source: None
1616
source_hash: None
1717
trim_output: True {# works in 2018.3.2. onwards #}
18-
archive_format: tar.gz
18+
archive_suffix: tar.gz
19+
archive_format: tar
1920
enforce_toplevel: True
2021
repo: {}
2122

‎golang/map.jinja

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
{%- set uri = golang.pkg.archive.uri + '/' + name %}
5555
{%- do golang.pkg.archive.update({
5656
'name': golang.pkg.archive.name + '/' + name,
57-
'source': uri + '.' + golang.pkg.archive.archive_format,
58-
'source_hash': uri + '.' + golang.pkg.archive.archive_format + '.sha256',
59-
'archive_format': golang.pkg.archive.archive_format.split('.')[0]
57+
'source': uri + '.' + golang.pkg.archive.archive_suffix,
58+
'source_hash': uri + '.' + golang.pkg.archive.archive_suffix + '.sha256',
59+
'archive_format': golang.pkg.archive.archive_format
6060
}) %}
61-
{%- do golang.update({'base_dir': golang.pkg.archive.name}) %}
61+
{%- do golang.update({'base_dir': golang.pkg.archive.name, 'go_root': golang.dir}) %}
6262
{%- do golang.environ.append('export PATH=${PATH}:' + golang.pkg.archive.name) %}
6363
{%- endif %}

‎golang/osfamilymap.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ FreeBSD:
3131
pkg:
3232
archive:
3333
source: https://storage.googleapis.com/golang/go1.10.2.freebsd-386.tar.gz
34-
source_hash: 62ac523c68a0d9b29df2ca1eb8057635
3534

3635
OpenBSD:
3736
rootgroup: wheel
@@ -48,12 +47,10 @@ Windows:
4847
archive:
4948
name: 'C:\\Program Files\\'
5049
source: https://storage.googleapis.com/golang/go1.10.1.linux-amd64.tar.gz
51-
source_hash: ad5d557f69f8cb6a6a7773eb374a24c9
5250

5351
MacOS:
5452
rootgroup: {{ macos_rootgroup | d('') }}
5553
pkg:
5654
archive:
5755
source: https://storage.googleapis.com/golang/go1.10.2.darwin-amd64.tar.gz
58-
source_hash: 5dfa18e856f90c406919e795bb3cb866
5956

0 commit comments

Comments
 (0)