Fix install.bat and init.sls.in

diff --git a/init.sls.in b/init.sls.in
index 0e11d54206b990c61882bed130e7498dfa5a16df..c0ade5f3102fce8aaa5dd2e54fb7fbc6faae02c1 100644 (file)
--- a/init.sls.in
+++ b/init.sls.in
@@ -8,27 +8,14 @@
 #
 # Description:          Package SLS
 ###############################################################################
-{% if grains['cpuarch'] == 'AMD64' %}
-{% set ARCH = "x64" %}
-{% else %}
-{% set ARCH = "x86" %}
-{% endif %}
-
-{% set LOG_PATH = 'C:\\salt\\var\\log' %}
 
 Autodesk_Fusion_360:
   'VERSION':
-      full_name: 'Autodesk Fusion 360'
-      installer: salt://win/repo-ng/Autodesk_Fusion_360/Fusion_360_Admin_Install.exe
-      {% if ARCH == 'x64' %}
-      uninstaller: '%PROGRAMFILES(x86)%\Autodesk\unins000.exe'
-      {% else %}
-      uninstaller: '%PROGRAMFILES%\Autodesk\unins000.exe'
-      {% endif %}
-      install_flags: '/S'
-      uninstall_flags: '/S'
+      full_name: 'Autodesk_Fusion_360'
+      installer: salt://win/repo-ng/Autodesk_Fusion_360/install.bat
+      uninstaller: salt://win/repo-ng/Autodesk_Fusion_360/uninstall.bat
       locale: de_DE
       msiexec: False
       reboot: False
-      cache_dir: False
+      cache_dir: True
 

diff --git a/repo-ng/install.bat b/repo-ng/install.bat
index b9d02d1350db761d0fe15011664fb031c2f79365..3e3e11e69354304fb89828f78c37bfd23e60e470 100755 (executable)
--- a/repo-ng/install.bat
+++ b/repo-ng/install.bat
@@ -1,6 +1,6 @@
 cd /D "%~dp0"\r
 \r
-Fusion_360_Admin_Install.exe /S\r
+Fusion_360_Admin_Install.exe --quiet\r
 \r
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Autodesk_Fusion_360" /v DisplayVersion /t REG_SZ /d 1.0 /f\r
 reg add "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Autodesk_Fusion_360" /v DisplayName /t REG_SZ /d Autodes_Fusion_360 /f\r