From 080be6c22f287d24133f5d319e083d7674c4ed0b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 4 Apr 2019 14:05:43 +0200 Subject: Rename script: itzks-user-suicide -> itzks-goodbye-user-session. --- bin/itzks-goodbye-user-session | 43 ++++++++++++++++++++++ bin/itzks-user-suicide | 43 ---------------------- debian/copyright | 2 +- debian/itzks-systems-diskless.install | 2 +- debian/itzks-systems-terminalserver.install | 2 +- debian/itzks-systems-workstation.install | 2 +- .../schemas/90_itzks+mate.gschema.override | 2 +- 7 files changed, 48 insertions(+), 48 deletions(-) create mode 100755 bin/itzks-goodbye-user-session delete mode 100755 bin/itzks-user-suicide diff --git a/bin/itzks-goodbye-user-session b/bin/itzks-goodbye-user-session new file mode 100755 index 0000000..82e2633 --- /dev/null +++ b/bin/itzks-goodbye-user-session @@ -0,0 +1,43 @@ +#!/bin/bash + +# Copyright (C) 2017 Mike Gabriel +# Copyright (C) 2017 Benjamin Schlüter +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +if [ $EUID -ge 500 ]; then + + # safety net for well-known browsers + pkill -TERM -u "${LOGNAME}" x-www-browser + pkill -TERM -u "${LOGNAME}" firefox-esr + pkill -TERM -u "${LOGNAME}" firefox + pkill -TERM -u "${LOGNAME}" iceweasel + pkill -TERM -u "${LOGNAME}" chromium + pkill -TERM -u "${LOGNAME}" chrome + pkill -TERM -u "${LOGNAME}" konqueror + pkill -TERM -u "${LOGNAME}" midori + pkill -TERM -u "${LOGNAME}" opera + sleep 1 + + # dump all other processes the hard way... + pkill -KILL -u "${LOGNAME}" + +else + + echo "$(basename $0): System accounts are not allowed to commit suicide." + +fi + +exit 0 diff --git a/bin/itzks-user-suicide b/bin/itzks-user-suicide deleted file mode 100755 index 82e2633..0000000 --- a/bin/itzks-user-suicide +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2017 Mike Gabriel -# Copyright (C) 2017 Benjamin Schlüter -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -if [ $EUID -ge 500 ]; then - - # safety net for well-known browsers - pkill -TERM -u "${LOGNAME}" x-www-browser - pkill -TERM -u "${LOGNAME}" firefox-esr - pkill -TERM -u "${LOGNAME}" firefox - pkill -TERM -u "${LOGNAME}" iceweasel - pkill -TERM -u "${LOGNAME}" chromium - pkill -TERM -u "${LOGNAME}" chrome - pkill -TERM -u "${LOGNAME}" konqueror - pkill -TERM -u "${LOGNAME}" midori - pkill -TERM -u "${LOGNAME}" opera - sleep 1 - - # dump all other processes the hard way... - pkill -KILL -u "${LOGNAME}" - -else - - echo "$(basename $0): System accounts are not allowed to commit suicide." - -fi - -exit 0 diff --git a/debian/copyright b/debian/copyright index c762f22..4398b65 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,7 +43,7 @@ Comment: Files: bin/smarttech-SMARTBoardService bin/passwd bin/itzks-hosts - bin/itzks-user-suicide + bin/itzks-goodbye-user-session bin/itzks-filter-whitelist-sslmitm-ca debian/* etc/.java/deployment/deployment.config diff --git a/debian/itzks-systems-diskless.install b/debian/itzks-systems-diskless.install index 1da3420..a488f45 100644 --- a/debian/itzks-systems-diskless.install +++ b/debian/itzks-systems-diskless.install @@ -1,5 +1,5 @@ bin/itzks-hosts usr/bin/ -bin/itzks-user-suicide usr/bin/ +bin/itzks-goodbye-user-session usr/bin/ etc/.java etc/ etc/mimeapps.list etc/ etc/shutdown-at-night/ etc/ diff --git a/debian/itzks-systems-terminalserver.install b/debian/itzks-systems-terminalserver.install index d8c50ce..b25c286 100644 --- a/debian/itzks-systems-terminalserver.install +++ b/debian/itzks-systems-terminalserver.install @@ -1,4 +1,4 @@ -bin/itzks-user-suicide usr/bin/ +bin/itzks-goodbye-user-session usr/bin/ etc/.java etc/ etc/mimeapps.list etc/ share/glib-2.0/schemas/90_itzks+mate.gschema.override usr/share/glib-2.0/schemas/ diff --git a/debian/itzks-systems-workstation.install b/debian/itzks-systems-workstation.install index 5eac25e..7a3af84 100644 --- a/debian/itzks-systems-workstation.install +++ b/debian/itzks-systems-workstation.install @@ -1,5 +1,5 @@ bin/itzks-hosts usr/bin/ -bin/itzks-user-suicide usr/bin/ +bin/itzks-goodbye-user-session usr/bin/ etc/.java etc/ etc/cron.daily/itzks-systems-workstation /etc/cron.daily/ etc/mimeapps.list etc/ diff --git a/share/glib-2.0/schemas/90_itzks+mate.gschema.override b/share/glib-2.0/schemas/90_itzks+mate.gschema.override index 7a51719..d0e1c90 100644 --- a/share/glib-2.0/schemas/90_itzks+mate.gschema.override +++ b/share/glib-2.0/schemas/90_itzks+mate.gschema.override @@ -5,7 +5,7 @@ default-layout="itzks" lock-delay=5 logout-delay=40 logout-enabled=true -logout-command='/usr/bin/itzks-user-suicide' +logout-command='/usr/bin/itzks-goodbye-user-session' [org.mate.session] idle-delay=15 -- cgit v1.2.3