Merge pull request #59 from svalabs/fix_pkg_format

fix for pkg_format var on Windows systems
svalabs · Dec 6, 2024 · bdd1a04 · bdd1a04
2 parents f5a7629 + 8217584
commit bdd1a04
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,18 @@ Sva.Sentinelone Release Notes
 =============================
 
 .. contents:: Topics
+v2.0.5
+======
+
+Release Summary
+---------------
+
+This is a bugfix release
+
+Bugfixes
+--------
+
+- added default values for the pkg_format var to fix issues with the installation on Windows systems
 
 v2.0.4
 ======

diff --git a/galaxy.yml b/galaxy.yml
@@ -9,7 +9,7 @@ namespace: "sva"
 name: "sentinelone"
 
 # The version of the collection. Must be compatible with semantic versioning
-version: "2.0.4"
+version: "2.0.5"
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: "README.md"

diff --git a/roles/install_agent/vars/main.yml b/roles/install_agent/vars/main.yml
@@ -1,9 +1,9 @@
 ---
 # vars file for install_agent
-pkg_format: "{% if ansible_facts.pkg_mgr in ['yum', 'dnf', 'zypper'] %}rpm{%
-  elif ansible_facts.pkg_mgr == 'apt' %}deb{%
-  elif ansible_facts.os_family == 'Windows' and not win_use_exe %}msi{%
-  elif ansible_facts.os_family == 'Windows' and win_use_exe %}exe{%
+pkg_format: "{% if ansible_facts.pkg_mgr | default([]) in ['yum', 'dnf', 'zypper'] %}rpm{%
+  elif ansible_facts.pkg_mgr | default('') == 'apt' %}deb{%
+  elif ansible_facts.os_family | default('') == 'Windows' and not win_use_exe %}msi{%
+  elif ansible_facts.os_family | default('') == 'Windows' and win_use_exe %}exe{%
   else %}unknown{% endif %}"
 pkg_arch: "{% if ansible_facts.architecture | regex_search('x86_64|64-bit') %}64_bit{%
   elif ansible_facts.architecture | regex_search('i386|32-bit') %}32_bit{%