diff --git a/states/ripgrep/install.sls b/states/ripgrep/install.sls index b037ff0..669aa0f 100644 --- a/states/ripgrep/install.sls +++ b/states/ripgrep/install.sls @@ -1,10 +1,10 @@ --- {%- from "ripgrep/map.jinja" import ripgrep with context %} -{% set archive_exclude_dir = './ripgrep-' + ripgrep.version + '-' + ripgrep.arch + '-unknown-' + ripgrep.os + '-musl' %} +{% set archive_exclude_dir = './ripgrep-' + ripgrep.version + '-' + ripgrep.arch + '-unknown-' + ripgrep.os + '-' + {{ ripgrep.variant }} %} ripgrep-archive-extract: archive.extracted: - name: {{ ripgrep.release_dir }}/ripgrep-{{ ripgrep.version }} - - source: {{ ripgrep.mirror }}/{{ ripgrep.version }}/ripgrep-{{ ripgrep.version }}-{{ ripgrep.arch }}-unknown-{{ ripgrep.os|lower }}-musl.tar.gz + - source: {{ ripgrep.mirror }}/{{ ripgrep.version }}/ripgrep-{{ ripgrep.version }}-{{ ripgrep.arch }}-unknown-{{ ripgrep.os|lower }}-{{ ripgrep.variant }}.tar.gz - skip_verify: true - options: > --transform 's|^\{{ archive_exclude_dir }}|/|g' diff --git a/states/ripgrep/osarchmap.yaml b/states/ripgrep/osarchmap.yaml index 9fde1c4..04fb489 100644 --- a/states/ripgrep/osarchmap.yaml +++ b/states/ripgrep/osarchmap.yaml @@ -1,18 +1,23 @@ --- amd64: arch: "x86_64" + variant: musl x86_64: arch: "x86_64" + variant: musl 386: - arch: "386" + arch: "686" + variant: gnu arm64: arch: "aarch64" + variant: gnu aarch64: arch: "aarch64" + variant: gnu armv6l: arch: "arm"