salt-minion-py3: use registry install_dir for uninstaller where neces…

…sary
saltstack · Dec 24, 2021 · 499513a · 499513a
1 parent 247e389
commit 499513a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/salt-minion-py3.sls b/salt-minion-py3.sls
@@ -1,3 +1,5 @@
+{% set install_dir = salt["reg.read_value"]("HKLM", "SOFTWARE\\Salt Project\\Salt", "install_dir").vdata %}
+{% set install_dir = install_dir or "C:\\salt" %}
 salt-minion-py3:
   {%
       for installer_version in [
@@ -16,7 +18,7 @@ salt-minion-py3:
     installer: 'https://repo.saltproject.io/windows/Salt-Minion-{{ installer_version }}-Py3-x86-Setup.exe'
     {% endif %}
     install_flags: '/S'
-    uninstaller: 'C:\salt\uninst.exe'
+    uninstaller: '{{ install_dir }}\uninst.exe'
     uninstall_flags: '/S'
     msiexec: False
     use_scheduler: True
@@ -85,7 +87,7 @@ salt-minion-py3:
   '{{ version }}':
     skip_urltest: True
     full_name: 'Salt Minion {{ version }} (Python 3)'
-    uninstaller: 'C:\salt\uninst.exe'
+    uninstaller: '{{ install_dir }}\uninst.exe'
     uninstall_flags: '/S'
     use_scheduler: True
   {% endfor %}