1 files changed, 2 insertions, 188 deletions

diff --git a/www/baikal/pkg-plist b/www/baikal/pkg-plist
index ae996b4b5aba..ed5adbe69540 100644
--- a/www/baikal/pkg-plist
+++ b/www/baikal/pkg-plist
@@ -301,11 +301,7 @@
 %%WWWDIR%%/Core/Resources/Web/README.md
 %%WWWDIR%%/Core/Resources/Web/TwitterBootstrap
 %%WWWDIR%%/Specific/.htaccess
-@owner %%WWWOWN%%
-@group %%WWWGRP%%
-@sample %%WWWDIR%%/Specific/db/db.sqlite.sample
-@group %%BINGRP%%
-@owner %%BINOWN%%
+@sample(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/Specific/db/db.sqlite.sample
 %%WWWDIR%%/html/.htaccess
 %%WWWDIR%%/html/admin/index.php
 %%WWWDIR%%/html/admin/install/index.php
@@ -823,186 +819,4 @@
 %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
 %%WWWDIR%%/vendor/sabre/vobject/tests/bootstrap.php
 %%WWWDIR%%/vendor/sabre/vobject/tests/phpunit.xml
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model/AddressBook
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model/Calendar
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model/Config
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/Model
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal/WWWRoot
-@dirrm %%WWWDIR%%/Core/Frameworks/Baikal
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Navigation
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Controller
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Images
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Strings/EN
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Strings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Page
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources/Templates
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Resources
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Route/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Route/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/Route
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Navigation
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/Settings
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View/User
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/View
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/WWWRoot/install
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin/WWWRoot
-@dirrm %%WWWDIR%%/Core/Frameworks/BaikalAdmin
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Controller
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/DOM
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Database
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Datastructure
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Model
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Render
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core/Requester
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Model/User
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Model
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Router
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib/Twig
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig/lib
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util/Twig
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake/Util
-@dirrm %%WWWDIR%%/Core/Frameworks/Flake
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal/Core
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal/Element
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal/Form
-@dirrm %%WWWDIR%%/Core/Frameworks/Formal
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap/css
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap/img
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap/js
-@dirrm %%WWWDIR%%/Core/Frameworks/TwitterBootstrap
-@dirrm %%WWWDIR%%/Core/Frameworks
-@dirrm %%WWWDIR%%/Core/Resources/Db/MySQL
-@dirrm %%WWWDIR%%/Core/Resources/Db/SQLite
-@dirrm %%WWWDIR%%/Core/Resources/Db
-@dirrm %%WWWDIR%%/Core/Resources/System
-@dirrm %%WWWDIR%%/Core/Resources/Web
-@dirrm %%WWWDIR%%/Core/Resources
-@dirrm %%WWWDIR%%/Core
-@owner %%WWWOWN%%
-@group %%WWWGRP%%
-@dirrmtry %%WWWDIR%%/Specific/db
-@group %%BINGRP%%
-@owner %%BINOWN%%
-@dirrmtry %%WWWDIR%%/Specific
-@dirrm %%WWWDIR%%/html/admin/install
-@dirrm %%WWWDIR%%/html/admin
-@dirrm %%WWWDIR%%/html/res
-@dirrm %%WWWDIR%%/html
-@dirrm %%WWWDIR%%/vendor/bin
-@dirrm %%WWWDIR%%/vendor/composer
-@dirrm %%WWWDIR%%/vendor/sabre/dav/bin
-@dirrm %%WWWDIR%%/vendor/sabre/dav/docs
-@dirrm %%WWWDIR%%/vendor/sabre/dav/examples/sql
-@dirrm %%WWWDIR%%/vendor/sabre/dav/examples/webserver
-@dirrm %%WWWDIR%%/vendor/sabre/dav/examples
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Principal
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CalDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CardDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CardDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/CardDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Auth
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Browser/assets/icons
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Browser/assets
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Browser
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/FS
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/FSExt
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Locks
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Mount
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV/Tree
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/DAVACL
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre/HTTP
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/dav/lib
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/Notification
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Principal
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CalDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CardDAV/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CardDAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/CardDAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Auth
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Browser
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/FSExt
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Locks
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Mount
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV/Tree
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAV
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL/Exception
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL/Property
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/DAVACL
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre/HTTP
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/dav/tests
-@dirrm %%WWWDIR%%/vendor/sabre/dav
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/bin
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject/Component
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject/Property
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject/Splitter
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre/VObject
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/lib
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/Component
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/Property
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject/Splitter
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre/VObject
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests/Sabre
-@dirrm %%WWWDIR%%/vendor/sabre/vobject/tests
-@dirrm %%WWWDIR%%/vendor/sabre/vobject
-@dirrm %%WWWDIR%%/vendor/sabre
-@dirrm %%WWWDIR%%/vendor
-@dirrmtry %%WWWDIR%%
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/Specific/db