From: buildmaster <buildmaster@git.cephalix.eu>
Date: Sat, 13 Oct 2018 07:18:23 +0000 (+0200)
Subject: Fix package setup.
X-Git-Url: https://repo.cephalix.eu/gitweb/?a=commitdiff_plain;h=66a3bd0435f39dc95a32c46384918b4b78b8b77f;p=UltraVNC.git

Fix package setup.
---

diff --git a/Makefile b/Makefile
index 27b2c9c..587ea33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PACKAGE         = $(shell basename `pwd` )
+PACKAGE         = UltraVnc
 DESTDIR         = /
 REPO            = /srv/www/repo/salt-packages/
 VERSION         = $(shell cat VERSION )
@@ -13,7 +13,6 @@ package:
 	sed -i s/PACKAGE/$(PACKAGE)/g  oss-pkg-$(PACKAGE).spec
 	sed -i s/YEAR/$(YEAR)/g        oss-pkg-$(PACKAGE).spec
 	mkdir -p oss-pkg-$(PACKAGE)
-	if [ ! -e $(PACKAGE).sls ];  then cp ../template/template.sls $(PACKAGE).sls; fi
 	sed s/PACKAGE/$(PACKAGE)/g  $(PACKAGE).sls > oss-pkg-$(PACKAGE)/$(PACKAGE).sls
 	if [ -d repo-ng ]; then ln -s ../repo-ng/ oss-pkg-$(PACKAGE)/repo-ng; fi
 	tar hjcvpf oss-pkg-$(PACKAGE).tar.bz2 oss-pkg-$(PACKAGE)  
diff --git a/oss-pkg-UltraVnc.spec.in b/oss-pkg-UltraVnc.spec.in
index 69683e1..87db44f 100644
--- a/oss-pkg-UltraVnc.spec.in
+++ b/oss-pkg-UltraVnc.spec.in
@@ -86,6 +86,7 @@ then
 	echo -ne "passwd2=${UVNCPW2}00\r\n" >> /srv/salt/win/repo-ng/PACKAGE/ultravnc.ini
 fi
 /usr/sbin/oss_api.sh POST 'softwares/add' '{"name":"PACKAGE","manually":false,"description":"PACKAGE","softwareVersions":[{"version":"VERSION"}]}'
+systemctl enable oss_get_screenshots.service
 
 %postun
 %service_del_postun oss_get_screenshots.service
@@ -94,7 +95,8 @@ fi
 %defattr(644,root,root)
 /srv/salt/win/repo-ng/PACKAGE
 /srv/salt/packages/PACKAGE.sls
-/usr/share/oss/vnc
 /usr/lib/systemd/system/oss_*
+%defattr(755,root,root)
+/usr/share/oss/vnc
 /usr/sbin/oss_*
 
diff --git a/server/oss_get_screenshots.sh b/server/oss_get_screenshots.sh
index 4132634..0b7a515 100755
--- a/server/oss_get_screenshots.sh
+++ b/server/oss_get_screenshots.sh
@@ -8,7 +8,7 @@ do
         if [ -d /var/adm/oss/running/ ]; then
                 for i in $( ls /var/adm/oss/running/ )
                 do
-                        /usr/share/oss/tools/vnc/get_screen_shot.sh ${i/.$SCHOOL_DOMAIN/} &
+                        /usr/share/oss/tools/get_screenshot.sh ${i/.$SCHOOL_DOMAIN/} &
                 done
         fi
         sleep 4