From: buildmaster <buildmaster@git.cephalix.eu>
Date: Sat, 13 Oct 2018 08:52:22 +0000 (+0200)
Subject: Fix the package.
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=5a8429b4bffbe2ab1f1d097d38f080166da95cf4;p=UltraVNC.git

Fix the package.
---

diff --git a/UltraVnc.sls b/UltraVnc.sls
index 9b889c2..0d47076 100644
--- a/UltraVnc.sls
+++ b/UltraVnc.sls
@@ -13,5 +13,8 @@ PACKAGE:
 
 copy_file:
   file.managed:
-    - source: salt://win/repo-ng/UltraVNC/ultravnc.ini
-    - name: '%Programfiles%\UltraVNC\ultravnc.ini'
+    - source: salt://win/repo-ng/UltraVnc/ultravnc.ini
+    - name: 'C:\Program Files\UltraVNC\ultravnc.ini'
+    - replace: True
+    - require:
+      - pkg: UltraVnc
diff --git a/oss-pkg-UltraVnc.spec.in b/oss-pkg-UltraVnc.spec.in
index 87db44f..59528e5 100644
--- a/oss-pkg-UltraVnc.spec.in
+++ b/oss-pkg-UltraVnc.spec.in
@@ -69,7 +69,7 @@ rm -rf %{buildroot}
 
 %post
 %service_add_post oss_get_screenshots.service
-if [ !-e /var/adm/oss/vncpwd/VNCPW1 ]
+if [ ! -e /var/adm/oss/vncpwd/VNCPW1 ]
 then
 	VNCPW1=$( mktemp -q XXXXXXXX )
 	VNCPW2=$( mktemp -q XXXXXXXX )
diff --git a/repo-ng/init.sls b/repo-ng/init.sls
index 01ff46d..f677b42 100644
--- a/repo-ng/init.sls
+++ b/repo-ng/init.sls
@@ -1,5 +1,5 @@
 ###############################################################################
-# SLS: UltraVNC
+# SLS: UltraVnc
 # Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany.
 # All rights reserved.
 #
@@ -16,14 +16,14 @@
 
 {% set LOG_PATH = 'C:\\salt\\var\\log' %}
 {% set DESTINATION = '%ProgramFiles%\\UltraVNC'%}
-UltraVNC:
+UltraVnc:
   '1.2.2.2':
     {% if ARCH == 'x64' %}
-    installer: salt://win/repo-ng/UltraVNC/UltraVNC_1_2_22_X64_Setup.exe
+    installer: salt://win/repo-ng/UltraVnc/UltraVNC_1_2_22_X64_Setup.exe
     {% else %}
-    installer: salt://win/repo-ng/UltraVNC/UltraVNC_1_2_22_X86_Setup.exe
+    installer: salt://win/repo-ng/UltraVnc/UltraVNC_1_2_22_X86_Setup.exe
     {% endif %}
-    full_name: 'UltraVNC'
+    full_name: 'UltraVnc'
     uninstaller: '{{ DESTINATION }}\unins000.exe'
     install_flags: '/VERYSILENT /NORESTART /TYPE=custom /COMPONENTS="ultravnc_server_s" /TASKS="installservice,startservice" /LOG={{ LOG_PATH }}\UVNC_inst.log /DIR="{{ DESTINATION }}"'
     uninstall_flags: '/VERYSILENT /NORESTART /LOG={{ LOG_PATH }}\UVNC_uninst.log'