Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
le-parental-control
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
le6
le-parental-control
Commits
02641528
There was a problem fetching the pipeline summary.
Commit
02641528
authored
7 years ago
by
Davisson Paulino
Committed by
Davisson Henrique Paulino
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed le-lab annoucement and added conflicts with le-conf
parent
b1befde8
No related branches found
No related tags found
1 merge request
!4
Fixed le-lab annoucement and added conflicts with le-conf
Pipeline
#
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
package/debian/changelog
+9
-3
9 additions, 3 deletions
package/debian/changelog
package/debian/control
+3
-2
3 additions, 2 deletions
package/debian/control
package/family-shield
+8
-8
8 additions, 8 deletions
package/family-shield
with
20 additions
and
13 deletions
package/debian/changelog
+
9
−
3
View file @
02641528
le-parental-control (0.0.4) testing; urgency=medium
* Added conflicts
* Fixed le-lab annoucement
-- Davisson Paulino <dhpaulino@gmail.com> Fri, 02 Mar 2018 12:04:51 -0300
le-parental-control (0.0.3) testing; urgency=medium
* Update Manual page
* Update Manual page
-- Rafael Sanfelice Castilho <rsc15@inf.ufpr.br> Fri, 02 Mar 2018 11:24:31 -0300
le-parental-control (0.0.2) testing; urgency=medium
* Fix enabling family-shield bug
* Fix enabling family-shield bug
-- Andre Luis da Silva Machado <contato@c3sl.ufpr.br> Thu, 01 Mar 2018 11:20:02 -0200
...
...
@@ -15,4 +22,3 @@ le-parental-control (0.0.1) testing; urgency=medium
* Separate family-shield and le-conf
-- Andre Luis da Silva Machado <contato@c3sl.ufpr.br> Fri, 09 Feb 2018 11:48:02 -0200
This diff is collapsed.
Click to expand it.
package/debian/control
+
3
−
2
View file @
02641528
...
...
@@ -2,7 +2,7 @@ Source: le-parental-control
Section: admin
Priority: extra
Maintainer: Andre Luis da Silva Machado <contato@c3sl.ufpr.br>
Uploaders: Rafael Sanfelice Castilho <rsc15@inf.ufpr.br>
Uploaders:
Davisson Paulino <dhpaulino@gmail.com>,
Rafael Sanfelice Castilho <rsc15@inf.ufpr.br>
Build-Depends: debhelper (>=9)
Standards-Version: 3.9.7
Vcs-Git: https://gitlab.c3sl.ufpr.br/le6/le-parental-control.git
...
...
@@ -10,6 +10,7 @@ Vcs-Git: https://gitlab.c3sl.ufpr.br/le6/le-parental-control.git
Package: le-parental-control
Architecture: all
Depends: ${misc:Depends}
Recommends: le-help, le-conf
Conflicts: le-conf (<< 0.0.29)
Recommends: le-help, le-conf(>=0.0.29)
Description: Configure Family Shield
Performs all configuration for Family Shield.
This diff is collapsed.
Click to expand it.
package/family-shield
+
8
−
8
View file @
02641528
...
...
@@ -76,16 +76,16 @@ function disable_family() {
# To make sure that we can advertise the same command later
function
advertise_enable
()
{
# Try to remove the disable family-shield service from network
dbus-send
--system
--dest
=
br.ufpr.c3sl.lelab /br/ufpr/c3sl/lelab br.ufpr.c3sl.lelab.Action.remove_local_service string:
'
disableFamilyShield
'
le-lab
-s
remove
disableFamilyShield
# Advertise enable service
dbus-send
--system
--dest
=
br.ufpr.c3sl.
lelab
/br/ufpr/c3sl/lelab br.ufpr.c3sl.lelab.Action.advertise_local_service string:
'
enableFamilyShield
'
le
-
lab
-s
advertise
enableFamilyShield
}
function
advertise_disable
()
{
# Try to remove the enable family-shield service from network
dbus-send
--system
--dest
=
br.ufpr.c3sl.
lelab
/br/ufpr/c3sl/lelab br.ufpr.c3sl.lelab.Action.remove_local_service string:
'
enableFamilyShield
'
le
-
lab
-s
remove
enableFamilyShield
# Advertise enable service
dbus-send
--system
--dest
=
br.ufpr.c3sl.lelab /br/ufpr/c3sl/lelab br.ufpr.c3sl.lelab.Action.advertise_local_service string:
'
disableFamilyShield
'
le-lab
-s
advertise
disableFamilyShield
}
function
check_services
()
{
...
...
@@ -93,7 +93,7 @@ function check_services() {
if
test
"
$serviceActive
"
;
then
echo
"Family Shield is on local network"
else
echo
"No Family Shield service active on local network"
echo
"No Family Shield service active on local network"
fi
}
...
...
@@ -118,7 +118,7 @@ do
;;
--help
|
-h
)
echo
"Usage: family-shield [OPTION]"
echo
echo
echo
" -h, --help display this help."
echo
" -e, --enable enable Family Shield."
echo
" -d, --disable disable Family Shield."
...
...
@@ -127,7 +127,7 @@ do
exit
1
;;
""
)
echo
"family-shield: missing operand"
echo
"family-shield: missing operand"
echo
"Try 'family-shield --help' for more information."
exit
1
;;
...
...
@@ -136,7 +136,7 @@ do
echo
"Try 'family-shield --help' for more information."
exit
1
;;
esac
esac
done
if
test
$STATUS
;
then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment