Skip to content

Commit 34cfd4b

Browse files
VitexusVitexus
committed
State freeze before fork branch for icinga2
1 parent 761898e commit 34cfd4b

7 files changed

Lines changed: 65 additions & 61 deletions

File tree

‎debian/conf/composer.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "vitexsoftware/icinga-editor",
3+
"description": "Editor of Icinga Configuration files",
4+
"authors": [
5+
{
6+
"name": "vitex",
7+
"email": "info@vitexsoftware.cz"
8+
}
9+
],
10+
"minimum-stability": "dev",
11+
"config": {
12+
"vendor-dir": "/var/lib/icinga-editor"
13+
},
14+
"require": {
15+
"php": ">= 5.5.9",
16+
"vitexsoftware/ease-framework": "dev-master"
17+
},
18+
"autoload": {
19+
"psr-4": {
20+
"Icinga\\Editor\\": "classes/",
21+
"Icinga\\Editor\\Engine\\": "classes/engine/",
22+
"Icinga\\Editor\\UI\\": "classes/UI",
23+
"Icinga\\Editor\\modules\\": "modules"
24+
}
25+
},
26+
"repositories": [
27+
{
28+
"type": "path",
29+
"url": "/usr/share/php/Ease",
30+
"options": {
31+
"symlink": true
32+
}
33+
}
34+
]
35+
36+
}

‎debian/deb-package.sh‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
#!/bin/bash
2-
3-
VERSION=`cat ./version | perl -ne 'chomp; print join(".", splice(@{[split/\./,$_]}, 0, -1), map {++$_} pop @{[split/\./,$_]}), "\n";'`
4-
echo $VERSION > ./version
5-
62
cd ..
73

8-
rm -f ./debian/changelog
9-
EDITOR=echo dch --create --newversion $VERSION-1 --package icinga-editor
4+
PACKAGE=`cat composer.json | grep '"name"' | head -n 1 | awk -F'"' '{print $4}' | awk -F'/' '{print $2}'`
5+
VERSION=`cat composer.json | grep version | awk -F'"' '{print $4}'`
6+
REVISION=`cat debian/revison | perl -ne 'chomp; print join(".", splice(@{[split/\./,$_]}, 0, -1), map {++$_} pop @{[split/\./,$_]}), "\n";'`
7+
CHANGES=`git log -n 1 | tail -n+5`
8+
dch -b -v $VERSION-$REVISION --package $PACKAGE $CHANGES
109

11-
sed -i "/define/c\define('IE_VERSION', '$VERSION');" src/classes/IEWebPage.php
10+
debuild -i -us -uc -b
1211

13-
debuild -i -d -us -uc -b
14-
rm -fr ./debian/icinga-editor/
1512

13+
LASTVERSION=`cat debian/lastversion`
14+
if [ $LASTVERSION == $VERSION ];
15+
then
16+
echo $REVISION > debian/revison
17+
else
18+
echo 0 > debian/revison
19+
echo $VERSION > debian/lastversion
20+
fi
1621

1722

23+
cd ..
24+
ls *.deb
25+
26+
#~/bin/publish-deb-packages.sh

‎debian/install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ src/includes/*.php usr/share/icinga-editor/includes
1111
src/classes/*.php usr/share/icinga-editor/classes
1212
src/modules/*.php usr/share/icinga-editor/modules
1313
debian/sql/install/* usr/share/dbconfig-common/data/icinga-editor/install
14+
debian/conf/composer.json usr/share/icinga-editor/
1415
debian/conf/icinga-editor.conf etc/apache2/conf-available
1516
debian/conf/icinga-editor.service etc/avahi/services
1617
debian/conf/icinga-editor etc/sudoers.d

‎debian/rules‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,10 @@
11
#!/usr/bin/make -f
2-
# Uncomment this to turn on verbose mode.
3-
#export DH_VERBOSE=1
42

5-
REVISION := $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//;s/.*-//')
3+
%:
4+
dh $@
65

7-
build-arch:
8-
9-
build: build-indep
10-
build-indep: build-stamp
11-
build-stamp:
12-
dh_testdir
13-
touch build-stamp
14-
15-
clean:
16-
dh_testdir
17-
dh_testroot
18-
rm -f build-stamp
19-
dh_clean
20-
21-
# debconf-updatepo --podir=app/lang
22-
23-
install: build
24-
dh_testdir
25-
dh_testroot
26-
dh_prep
27-
dh_installdirs
6+
override_dh_install:
287
dh_install
29-
30-
# Build architecture-independent files here.
31-
binary-indep: build install
32-
dh_testdir
33-
dh_testroot
34-
dh_installdebconf
35-
dh_installman
36-
dh_lintian
37-
dh_link
38-
dh_compress
39-
dh_fixperms
40-
dh_installdeb
41-
dh_gencontrol
42-
dh_md5sums
43-
dh_builddeb
44-
45-
# Build architecture-dependent files here.
46-
binary-arch:
47-
48-
binary: binary-indep binary-arch
49-
.PHONY: build clean binary-indep binary-arch binary install
8+
sed -i -e 's/..\//.\//g' debian/icinga-editor/usr/share/icinga-editor/about.php
9+
sed -i -e 's/..\/vendor/\/var\/lib\/flexipeehp/g' debian/icinga-editor/usr/share/icinga-editor/includes/Init.php
10+
sed -i -e 's/..\/i18n/\/usr\/share\/locale/g' debian/icinga-editor/usr/share/icinga-editor/includes/Init.php

‎nbproject/private/private.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
3-
<coverage xmlns="http://www.netbeans.org/ns/code-coverage/1" enabled="false"/>
3+
<coverage xmlns="http://www.netbeans.org/ns/code-coverage/1" enabled="true"/>
44
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
55
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
66
<group name="EaseProjects">
@@ -10,9 +10,6 @@
1010
<group name="Monitoring">
1111
<file>file:/home/vitex/Projects/VitexSoftware/iciedit/src/includes/Configure.php</file>
1212
</group>
13-
<group>
14-
<file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/classes/engine/IEService.php</file>
15-
<file>file:/home/vitex/Projects/VitexSoftware/icinga_configurator/src/modules/CheckDriveSize.inc.php</file>
16-
</group>
13+
<group/>
1714
</open-files>
1815
</project-private>

‎src/classes/UI/CfgEditor.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class CfgEditor extends \Ease\Container
1111
{
1212
/**
1313
* Právě editovaný objekt
14-
* @var IEcfg Objekt konfigurace
14+
* @var \Icinga\Editor\Engine\Configurator Objekt konfigurace
1515
*/
1616
public $objectEdited = null;
1717

‎src/classes/engine/Configurator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public function loadTemplate($template)
254254
}
255255

256256
/**
257-
* Zapíše konfigurační soubor nagiosu
257+
* Write config file for nagios/icinga
258258
*
259259
* @param string $filename
260260
* @param array $columns

0 commit comments

Comments
 (0)