Update to 5.0.570.0

diff --git a/repo-ng/GeoGebra-Windows-Installer-5-0-489-0.exe b/repo-ng/GeoGebra-Windows-Installer-5-0-570-0.msi
old mode 100755 (executable)
new mode 100644 (file)
similarity index 69%
rename from repo-ng/GeoGebra-Windows-Installer-5-0-489-0.exe
rename to repo-ng/GeoGebra-Windows-Installer-5-0-570-0.msi
index c556881..3fd39b3
Binary files a/repo-ng/GeoGebra-Windows-Installer-5-0-489-0.exe and b/repo-ng/GeoGebra-Windows-Installer-5-0-570-0.msi differ

diff --git a/repo-ng/GeoGebra-Windows-Installer-6-0-477-0.exe b/repo-ng/GeoGebra-Windows-Installer-6-0-477-0.exe
deleted file mode 100755 (executable)
index 61548ac..0000000
Binary files a/repo-ng/GeoGebra-Windows-Installer-6-0-477-0.exe and /dev/null differ

diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 4aa974df971126dab14be17f481030a6be453e43..646d507da925c0f84d5a75277a85fd95fca5a0cf 100644 (file)
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -16,17 +16,13 @@
 {% set LOG_PATH = 'C:\\salt\\var\\log\\' %}
 
 GeoGebra:
-  '5.0.489.0':
+  '5.0.570.0':
     full_name: 'GeoGebra 5'
-    installer: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-5-0-489-0.exe
-    {% if ARCH == 'x64' %}
-    uninstaller: 'C:\Program Files (x86)\GeoGebra 5.0\uninstaller.exe'
-    {% else %}
-    uninstaller: 'C:\Program Files\GeoGebra 5.0\uninstaller.exe'
-    {% endif %}
-    install_flags: '/S'
-    uninstall_flags: '/S'
+    installer: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-5-0-570-0.msi
+    uninstaller: salt://win/repo-ng/GeoGebra/GeoGebra-Windows-Installer-5-0-570-0.msi
+    install_flags: 'ALLUSERS=2 /qn /log {{ LOG }}GeoGebra_inst.log'
+    uninstall_flags: '/qn /log {{ LOG }}GeoGebra_uninst.log'
     msiexec: False
     locale: de_DE
     reboot: False
-    cache_dir: False 
+    cache_dir: True