From 68e2ac4d8380274ced1cceb68c182af474ed876e Mon Sep 17 00:00:00 2001 From: CEPHALIX GIT ADMIN Date: Mon, 29 Jul 2019 09:50:04 +0200 Subject: [PATCH] Initial version --- FULLNAMES | 1 + LICENSE | 1 + Makefile | 31 ++++++++++++++++++ RELEASE | 1 + Schreiblabor.sls | 14 ++++++++ VERSION | 1 + oss-pkg-Schreiblabor.spec.in | 58 ++++++++++++++++++++++++++++++++++ repo-ng/Schreiblabor3-Inst.bat | 15 +++++++++ repo-ng/init.sls | 25 +++++++++++++++ 9 files changed, 147 insertions(+) create mode 100644 FULLNAMES create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 RELEASE create mode 100644 Schreiblabor.sls create mode 100644 VERSION create mode 100644 oss-pkg-Schreiblabor.spec.in create mode 100755 repo-ng/Schreiblabor3-Inst.bat create mode 100644 repo-ng/init.sls diff --git a/FULLNAMES b/FULLNAMES new file mode 100644 index 0000000..c9644ad --- /dev/null +++ b/FULLNAMES @@ -0,0 +1 @@ +Schreib- und Leselabor 3 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c70fc0d --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +Copyright (c) 2017 Peter Varkoly and Helmuth Varkoly Nürnberg. All rights reserverd. \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..83c08d4 --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +PACKAGE = $(shell basename `pwd` ) +DESTDIR = / +REPO = /srv/www/repo/TESTING/salt-packages/ +VERSION = $(shell cat VERSION ) +RELEASE = $(shell cat RELEASE ) +NRELEASE = $(shell echo $(RELEASE) + 1 | bc ) +YEAR = $(shell date +%Y ) + +package: + sed s/VERSION/$(VERSION)/g oss-pkg-$(PACKAGE).spec.in > oss-pkg-$(PACKAGE).spec + sed -i s/RELEASE/$(NRELEASE)/g oss-pkg-$(PACKAGE).spec + sed -i s/PACKAGE/$(PACKAGE)/g oss-pkg-$(PACKAGE).spec + sed -i s/YEAR/$(YEAR)/g oss-pkg-$(PACKAGE).spec + ../oss-pkg-tools/create_hash.sh $(PACKAGE) + rm -rf oss-pkg-$(PACKAGE) + rm -rf repo-ng/repo-ng + mkdir -p oss-pkg-$(PACKAGE) + 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) + rm -rf oss-pkg-$(PACKAGE) + mv oss-pkg-$(PACKAGE).tar.bz2 /usr/src/packages/SOURCES/ + rpmbuild -bb oss-pkg-$(PACKAGE).spec + cp /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch + for i in $(REPO)/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-*.rpm; do test -e $$i && rm $$i; done + mv /usr/src/packages/RPMS/noarch/oss-pkg-$(PACKAGE)-$(VERSION)-$(NRELEASE).noarch.rpm $(REPO)/noarch + echo $(NRELEASE) > RELEASE + git commit -a -m "New release" + git push + + diff --git a/RELEASE b/RELEASE new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/RELEASE @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/Schreiblabor.sls b/Schreiblabor.sls new file mode 100644 index 0000000..f452394 --- /dev/null +++ b/Schreiblabor.sls @@ -0,0 +1,14 @@ +############################################################################### +# SLS: PACKAGE +# Copyright (c) 2017 Helmuth Varkoly, Nuermberg, Germany. +# All rights reserved. +# +# Author: Helmuth Varkoly +# +# Description: SLS to use with OSS's softwaremanagement +############################################################################### +PACKAGE: + pkg: + - installed + + diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3 diff --git a/oss-pkg-Schreiblabor.spec.in b/oss-pkg-Schreiblabor.spec.in new file mode 100644 index 0000000..cd3e3f7 --- /dev/null +++ b/oss-pkg-Schreiblabor.spec.in @@ -0,0 +1,58 @@ +# +# Spec file for PACKAGE +# Copyright (c) YEAR Helmuth Varkoly and Peter Varkoly Nuremberg, Germany. All rights reserved. +# + +Name: oss-pkg-PACKAGE +Summary: Package to install PACKAGE on OSS-Clients +Version: VERSION +Release: RELEASE +License: GPL-2.0 +Vendor: Peter Varkoly and Helmuth Varkoly +Packager: peter@varkoly.de +Group: Productivity/ +Source: %{name}.tar.bz2 +BuildArch: noarch +BuildRequires:unzip +#Requires: +Requires: filesystem +PreReq: salt-master +PreReq: %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Package to install PACKAGE on OSS-Clients + +Authors: +-------- + helmuth@varkoly.de + peter@varkoly.de + + +%prep +%setup -n %{name} + +%build + +%install + +mkdir -p %{buildroot}/srv/salt/win/repo-ng/PACKAGE +mkdir -p %{buildroot}/srv/salt/packages/ +cp PACKAGE.sls %{buildroot}/srv/salt/packages/ +cp -a repo-ng/* %{buildroot}/srv/salt/win/repo-ng/PACKAGE + +%clean +rm -rf %{buildroot} + +%pre + +%post + +/usr/sbin/oss_api_post_file.sh 'softwares/add' /srv/salt/win/repo-ng/PACKAGE/HASH.json + +%files +%defattr(644,root,root) +/srv/salt/win/repo-ng/PACKAGE +/srv/salt/packages/PACKAGE.sls + + diff --git a/repo-ng/Schreiblabor3-Inst.bat b/repo-ng/Schreiblabor3-Inst.bat new file mode 100755 index 0000000..a3884d5 --- /dev/null +++ b/repo-ng/Schreiblabor3-Inst.bat @@ -0,0 +1,15 @@ +@echo off + +echo Schreiblabor installieren... +"%~dp0setup.exe" /S /v/qn + +echo Pfad zur Datenablage einrichten... +%windir%\regedit.exe /s "%~dp0SL3-DA.reg" + +echo Schreiblabor auf Version 3.0.3 aktualisieren... +xcopy "%~dp0\V303\Schreiblabor.exe" "%ProgramFiles(x86)%\Schreiblabor 3\" /Y + +echo Handbuch vom Desktop entfernen... +del "%PUBLIC%\Desktop\Handbuch Schreib- und Leselabor 3.lnk" /s /q + +pause \ No newline at end of file diff --git a/repo-ng/init.sls b/repo-ng/init.sls new file mode 100644 index 0000000..9c99493 --- /dev/null +++ b/repo-ng/init.sls @@ -0,0 +1,25 @@ +############################################################################### +# SLS: Schreiblabor +# Copyright (c) 2019 Helmuth Varkoly, Nuermberg, Germany. +# All rights reserved. +# +# Authors: Helmuth Varkoly +# +# Description: Package SLS +############################################################################### + + +{% set LOG_PATH = 'C:\\salt\\var\\log' %} + +Schreiblabor: + '3': + installer: salt://win/repo-ng/Schreiblabor/Schreiblabor3-Inst.bat + uninstaller: 'msiexec.exe' + full_name: 'Schreib- und Leselabor 3' + install_flags: '' + uninstall_flags: '/x {F3C35F71-51F7-47F8-947A-244C9A9E0FC9} /q /log "{{ LOG_PATH }}\\Schreiblabor_uninst.log"' + msiexec: False + locale: de_DE + reboot: False + cache_dir: True + -- 2.43.0