The branch, master has been updated via 8d008dbadaab7527ccd85580056eb3cbcc16b9fe (commit) via c671ef9817d26b7a8cf0350558dd6887f9ad1787 (commit) via ef381eb4cb55fbdfb842f5f9fdcf9037e3f8caa6 (commit) from 7aa900c55a6c37ef74d4affe47d120fd488e1511 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8d008dbadaab7527ccd85580056eb3cbcc16b9fe Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 1 10:55:28 2013 +0100 /debian/x2gobroker-daemon.postinst: Fix home path for user x2gobroker. (Fixes: #127). commit c671ef9817d26b7a8cf0350558dd6887f9ad1787 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 1 10:11:05 2013 +0100 remove bashisms from postinst/postrm scripts commit ef381eb4cb55fbdfb842f5f9fdcf9037e3f8caa6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 1 10:08:43 2013 +0100 drop python-x2go.postinst scripts ----------------------------------------------------------------------- Summary of changes: debian/python-x2gobroker.postrm | 39 ------------------------------------- debian/x2gobroker-agent.postinst | 16 +++++++-------- debian/x2gobroker-agent.postrm | 10 +++++----- debian/x2gobroker-daemon.postinst | 20 +++++++++---------- debian/x2gobroker-daemon.postrm | 10 +++++----- 5 files changed, 27 insertions(+), 68 deletions(-) delete mode 100755 debian/python-x2gobroker.postrm The diff of changes is: diff --git a/debian/python-x2gobroker.postrm b/debian/python-x2gobroker.postrm deleted file mode 100755 index 22abe93..0000000 --- a/debian/python-x2gobroker.postrm +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -# postrm script for x2gobroker-agent -# -# see: dh_installdeb(1) -# summary of how this script can be called: -# * <postrm> `remove' -# * <postrm> `purge' -# * <old-postrm> `upgrade' <new-version> -# * <new-postrm> `failed-upgrade' <old-version> -# * <new-postrm> `abort-install' -# * <new-postrm> `abort-install' <old-version> -# * <new-postrm> `abort-upgrade' <old-version> -# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version> -# for details, see /usr/share/doc/packaging-manual/ - -set -e - - -case "$1" in - purge) - if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then - dpkg-statoverride --remove /var/log/x2gobroker - fi - - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst index 3f7c1ed..a9c761b 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/x2gobroker-agent.postinst @@ -25,19 +25,19 @@ case "$1" in configure) # setup user/group x2gobroker - if ! getent group x2gobroker >/dev/null; then - echo "Creating x2gobroker group." >&2 + if ! getent group x2gobroker 1>/dev/null; then + echo "Creating x2gobroker group." 1>&2 addgroup --system x2gobroker else - echo "Group x2gobroker already exists." >&2 + echo "Group x2gobroker already exists." 1>&2 fi - if ! getent passwd x2gobroker >/dev/null; then - echo "Creating x2gobroker user." >&2 + if ! getent passwd x2gobroker 1>/dev/null; then + echo "Creating x2gobroker user." 1>&2 adduser --system \ --disabled-password --disabled-login \ --shell /bin/bash --group --home /var/lib/x2gobroker x2gobroker else - echo "User x2gobroker already exists." >&2 + echo "User x2gobroker already exists." 1>&2 # make sure all settings are appropriate if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then mkdir -p /var/lib/x2gobroker @@ -51,7 +51,7 @@ case "$1" in fi # the x2gobroker-agent has to be installed setuid root - if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then + if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent fi @@ -61,7 +61,7 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument \`$1'" 1>&2 exit 1 ;; esac diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm index a9dc429..bc535ee 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/x2gobroker-agent.postrm @@ -18,15 +18,15 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then + if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent fi if [ ! -d /usr/share/doc/x2gobroker-daemon ]; then # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon - getent passwd x2gobroker >/dev/null && deluser x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker + getent passwd x2gobroker 1>/dev/null && deluser x2gobroker + getent group x2gobroker 1>/dev/null && delgroup x2gobroker + getent group x2gobroker 1>/dev/null && delgroup x2gobroker rm -Rfv /var/lib/x2gobroker fi @@ -34,7 +34,7 @@ case "$1" in remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument \`$1'" 1>&2 exit 0 ;; esac diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst index b37c2f5..ab346f8 100755 --- a/debian/x2gobroker-daemon.postinst +++ b/debian/x2gobroker-daemon.postinst @@ -25,19 +25,19 @@ case "$1" in configure) # setup user/group x2gobroker - if ! getent group x2gobroker >/dev/null; then - echo "Creating x2gobroker group." >&2 + if ! getent group x2gobroker 1>/dev/null; then + echo "Creating x2gobroker group." 1>&2 addgroup --system x2gobroker else - echo "Group x2gobroker already exists." >&2 + echo "Group x2gobroker already exists." 1>&2 fi - if ! getent passwd x2gobroker >/dev/null; then - echo "Creating x2gobroker user." >&2 + if ! getent passwd x2gobroker 1>/dev/null; then + echo "Creating x2gobroker user." 1>&2 adduser --system \ --disabled-password --disabled-login \ - --shell /bin/bash --group --home /var/lib/x2go x2gobroker + --shell /bin/bash --group --home /var/lib/x2go/x2gobroker x2gobroker else - echo "User x2gobroker already exists." >&2 + echo "User x2gobroker already exists." 1>&2 # make sure all settings are appropriate if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then mkdir -p /var/lib/x2gobroker @@ -51,7 +51,7 @@ case "$1" in fi # the x2gobroker-daemon needs special permissions on its log directory - if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + if ! dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker fi @@ -61,7 +61,7 @@ case "$1" in ;; *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "postinst called with unknown argument \`$1'" 1>&2 exit 1 ;; esac @@ -72,5 +72,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm index 42f3752..34a8687 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -19,15 +19,15 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then dpkg-statoverride --remove /var/log/x2gobroker fi if [ ! -d /usr/share/doc/x2gobroker-agent ]; then # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent - getent passwd x2gobroker >/dev/null && deluser x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker - getent group x2gobroker >/dev/null && delgroup x2gobroker + getent passwd x2gobroker 1>/dev/null && deluser x2gobroker + getent group x2gobroker 1>/dev/null && delgroup x2gobroker + getent group x2gobroker 1>/dev/null && delgroup x2gobroker rm -Rf /var/lib/x2gobroker fi @@ -35,7 +35,7 @@ case "$1" in remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ;; *) - echo "postrm called with unknown argument \`$1'" >&2 + echo "postrm called with unknown argument \`$1'" 1>&2 exit 0 ;; esac hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).