[X2Go-Commits] [x2goserver] 01/13: debian/*.{pre, post}*: rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts.
git-admin at x2go.org
git-admin at x2go.org
Fri Jul 27 01:52:09 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 08fe08f348b76748efe07e618c32b10559aa1966
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Jul 26 23:37:21 2018 +0200
debian/*.{pre,post}*: rework scriptlets, use updated templates, add missing templates, more and better quoting, fix other misc. errors within the scripts.
---
debian/changelog | 3 +++
debian/libx2go-server-db-perl.postinst | 44 ++++++++++++++++------------------
debian/libx2go-server-db-perl.postrm | 41 ++++++++++++++++---------------
debian/libx2go-server-db-perl.prerm | 17 ++++++-------
debian/x2goserver-common.postinst | 2 +-
debian/x2goserver-common.postrm | 17 +++++++------
debian/x2goserver-common.preinst | 2 +-
debian/x2goserver-fmbindings.postinst | 8 +++----
debian/x2goserver-fmbindings.postrm | 6 ++---
debian/x2goserver-printing.postinst | 2 +-
debian/x2goserver-printing.postrm | 4 ++--
debian/x2goserver.postinst | 2 +-
debian/x2goserver.postrm | 6 ++---
debian/x2goserver.preinst | 2 +-
debian/x2goserver.prerm | 2 +-
15 files changed, 81 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cc5df9c..70fb636 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -184,6 +184,9 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
* debian/{libx2go-server-db-perl,x2goserver{,-common}}.postrm:
+ Do not try to run rmdir on /etc/x2go if it doesn't exist. Makes the
scriptlet (and thus the purge operation) fail...
+ * debian/*.{pre,post}*:
+ + Rework scriptlets, use updated templates, add missing templates, more
+ and better quoting, fix other misc. errors within the scripts.
-- X2Go Release Manager <git-admin at x2go.org> Thu, 15 Feb 2018 23:14:28 +0100
diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst
index dd97f67..5a99ff5 100755
--- a/debian/libx2go-server-db-perl.postinst
+++ b/debian/libx2go-server-db-perl.postinst
@@ -18,18 +18,18 @@ set -e
# the debian-policy package
-case "$1" in
- configure)
- mkdir -p /etc/x2go/x2gosql/passwords
- chmod 700 /etc/x2go/x2gosql/passwords
- touch /etc/x2go/x2gosql/passwords/pgadmin
- chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
- touch /etc/x2go/x2gosql/passwords/mysqladmin
- chmod 600 /etc/x2go/x2gosql/passwords/mysqladmin
+case "${1}" in
+ 'configure')
+ mkdir -p '/etc/x2go/x2gosql/passwords'
+ chmod '700' '/etc/x2go/x2gosql/passwords'
+ touch '/etc/x2go/x2gosql/passwords/pgadmin'
+ chmod '600' '/etc/x2go/x2gosql/passwords/pgadmin'
+ touch '/etc/x2go/x2gosql/passwords/mysqladmin'
+ chmod '600' '/etc/x2go/x2gosql/passwords/mysqladmin'
# the SQLite3 X2Go session db has to be accessed as uid x2gouser
- if ! dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then
- dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+ if ! dpkg-statoverride --list '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper' >'/dev/null'; then
+ dpkg-statoverride --add --update 'root' 'x2gouser' '2755' '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper'
fi
# setup up SQLite3 database, do nothing if PostgeSQL is already configured
@@ -37,30 +37,30 @@ case "$1" in
# Note: The below code exists in x2goserver.postinst and libx2go-server-db.postinst
# It will only succeed if both packages are installed. As we cannot influence the
# installation order, we handle the session DB creation in both packages. One of
- # then should succeed.
- if [ -x /usr/sbin/x2godbadmin ] && [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql 1>/dev/null; then
- if [ ! -f /var/lib/x2go/x2go_sessions ]; then
+ # them should succeed.
+ if [ -x '/usr/sbin/x2godbadmin' ] && [ -f '/etc/x2go/x2gosql/sql' ] && egrep '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' 1>'/dev/null'; then
+ if [ ! -f '/var/lib/x2go/x2go_sessions' ]; then
x2godbadmin --createdb
else
# make sure db permissions are set correctly
- chown -R root:x2gouser /var/lib/x2go
+ chown -R 'root:x2gouser' '/var/lib/x2go'
# egid x2gouser needs write access to the db dir (for temporary db journal file)
- chmod 0770 /var/lib/x2go
+ chmod '0770' '/var/lib/x2go'
# ... and to the db file itself, of course
- chmod 0660 /var/lib/x2go/x2go_sessions
+ chmod '0660' '/var/lib/x2go/x2go_sessions'
x2godbadmin --updatedb
fi
else
- echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone."
+ echo 'X2Go is configured to use a non-SQLite DB backend, leaving the database alone.'
fi
;;
- abort-upgrade|abort-remove|abort-deconfigure)
+ 'abort-upgrade'|'abort-remove'|'abort-deconfigure')
;;
*)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
+ echo "postinst called with unknown argument '${1}'" >&2
+ exit '1'
;;
esac
@@ -69,6 +69,4 @@ esac
#DEBHELPER#
-exit 0
-
-
+exit '0'
diff --git a/debian/libx2go-server-db-perl.postrm b/debian/libx2go-server-db-perl.postrm
index 2cf62c0..44229a7 100755
--- a/debian/libx2go-server-db-perl.postrm
+++ b/debian/libx2go-server-db-perl.postrm
@@ -1,7 +1,8 @@
-#! /bin/sh
+#!/bin/sh
# postrm script for libx2go-server-db-perl
-#
-# see: dh_installdeb(1)
+
+set -e
+
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
@@ -10,29 +11,27 @@
# * <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
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
- purge)
- echo "Removing X2Go session database" >&2
- rm -vf /var/lib/x2go/x2go_sessions
- rm -vf /etc/x2go/x2gosql/passwords/pgadmin
- rm -vf /etc/x2go/x2gosql/passwords/mysqladmin
- rm -Rf /etc/x2go/sql
- [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty /etc/x2go
+case "${1}" in
+ 'purge')
+ echo 'Removing X2Go session database' >&2
+ rm -vf '/var/lib/x2go/x2go_sessions'
+ rm -vf '/etc/x2go/x2gosql/passwords/pgadmin'
+ rm -vf '/etc/x2go/x2gosql/passwords/mysqladmin'
+ rm -Rf '/etc/x2go/sql'
+ [ -d '/etc/x2go' ] && rmdir --ignore-fail-on-non-empty '/etc/x2go'
;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
;;
*)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 0
+ echo "postrm called with unknown argument '${1}'" >&2
+ exit '1'
;;
esac
@@ -41,4 +40,4 @@ esac
#DEBHELPER#
-exit 0
+exit '0'
diff --git a/debian/libx2go-server-db-perl.prerm b/debian/libx2go-server-db-perl.prerm
index 67a3d51..d1ce62f 100755
--- a/debian/libx2go-server-db-perl.prerm
+++ b/debian/libx2go-server-db-perl.prerm
@@ -16,17 +16,18 @@
set -e
-case "$1" in
- remove)
- if dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then
- dpkg-statoverride --remove /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+case "${1}" in
+ 'remove')
+ if dpkg-statoverride --list '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper' >'/dev/null'; then
+ dpkg-statoverride --remove '/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper'
fi
;;
- deconfigure|upgrade|failed-upgrade)
+ 'deconfigure'|'upgrade'|'failed-upgrade')
:
;;
- *) echo "$0: didn't understand being called with \`$1'" 1>&2
- exit 1;;
+ *) echo "${0}: didn't understand being called with '${1}'" 1>&2
+ exit '1'
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
@@ -34,4 +35,4 @@ esac
#DEBHELPER#
-exit 0
+exit '0'
diff --git a/debian/x2goserver-common.postinst b/debian/x2goserver-common.postinst
index a49c10e..3fc3216 100755
--- a/debian/x2goserver-common.postinst
+++ b/debian/x2goserver-common.postinst
@@ -64,7 +64,7 @@ case "${1}" in
'abort-upgrade'|'abort-remove'|'abort-deconfigure')
;;
*)
- echo "postinst called with unknown argument \`${1}'" >&2
+ echo "postinst called with unknown argument '${1}'" >&2
exit '1'
;;
esac
diff --git a/debian/x2goserver-common.postrm b/debian/x2goserver-common.postrm
index 7b020f9..201b27e 100755
--- a/debian/x2goserver-common.postrm
+++ b/debian/x2goserver-common.postrm
@@ -1,7 +1,8 @@
-#! /bin/sh
+#!/bin/sh
# postrm script for x2goserver
-#
-# see: dh_installdeb(1)
+
+set -e
+
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
@@ -10,8 +11,10 @@
# * <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/
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
set -e
@@ -29,8 +32,8 @@ case "${1}" in
'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
;;
*)
- echo "postrm called with unknown argument \`${1}'" >&2
- exit '0'
+ echo "postrm called with unknown argument '${1}'" >&2
+ exit '1'
;;
esac
diff --git a/debian/x2goserver-common.preinst b/debian/x2goserver-common.preinst
index be9af4b..ac334ea 100755
--- a/debian/x2goserver-common.preinst
+++ b/debian/x2goserver-common.preinst
@@ -30,7 +30,7 @@ case "${1}" in
'abort-upgrade')
;;
*)
- echo "preinst called with unknown argument \`${1}'" >&2
+ echo "preinst called with unknown argument '${1}'" >&2
exit '1'
;;
esac
diff --git a/debian/x2goserver-fmbindings.postinst b/debian/x2goserver-fmbindings.postinst
index 25c9093..647a3a6 100755
--- a/debian/x2goserver-fmbindings.postinst
+++ b/debian/x2goserver-fmbindings.postinst
@@ -21,13 +21,13 @@ case "${1}" in
'configure')
update-desktop-database
update-mime-database '/usr/share/mime'
- ;;
+ ;;
'abort-upgrade'|'abort-remove'|'abort-deconfigure')
- ;;
+ ;;
*)
- echo "postinst called with unknown argument \`${1}'" >&2
+ echo "postinst called with unknown argument '${1}'" >&2
exit '1'
- ;;
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
diff --git a/debian/x2goserver-fmbindings.postrm b/debian/x2goserver-fmbindings.postrm
index 7d3c3e0..7880810 100755
--- a/debian/x2goserver-fmbindings.postrm
+++ b/debian/x2goserver-fmbindings.postrm
@@ -22,11 +22,11 @@ case "${1}" in
'purge'|'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
update-desktop-database
update-mime-database '/usr/share/mime'
- ;;
+ ;;
*)
- echo "postrm called with unknown argument \`${1}'" >&2
+ echo "postrm called with unknown argument '${1}'" >&2
exit '1'
- ;;
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
diff --git a/debian/x2goserver-printing.postinst b/debian/x2goserver-printing.postinst
index 2977564..3d7cf9f 100755
--- a/debian/x2goserver-printing.postinst
+++ b/debian/x2goserver-printing.postinst
@@ -78,7 +78,7 @@ case "${1}" in
;;
*)
- echo "postinst called with unknown argument \`${1}'" >&2
+ echo "postinst called with unknown argument '${1}'" >&2
exit '1'
;;
esac
diff --git a/debian/x2goserver-printing.postrm b/debian/x2goserver-printing.postrm
index 171be49..e575deb 100755
--- a/debian/x2goserver-printing.postrm
+++ b/debian/x2goserver-printing.postrm
@@ -24,8 +24,8 @@ case "${1}" in
'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
;;
*)
- echo "postrm called with unknown argument \`${1}'" >&2
- exit '0'
+ echo "postrm called with unknown argument '${1}'" >&2
+ exit '1'
;;
esac
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index b7f64e4..7c73421 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -79,7 +79,7 @@ case "${1}" in
'abort-upgrade'|'abort-remove'|'abort-deconfigure')
;;
*)
- echo "postinst called with unknown argument \`${1}'" >&2
+ echo "postinst called with unknown argument '${1}'" >&2
exit '1'
;;
esac
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index 3bf0d0f..f07a4dd 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -12,7 +12,7 @@ set -e
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <overwriter>i
+# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see /usr/share/doc/packaging-manual/
@@ -29,8 +29,8 @@ case "${1}" in
'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear')
;;
*)
- echo "postrm called with unknown argument \`${1}'" >&2
- exit '0'
+ echo "postrm called with unknown argument '${1}'" >&2
+ exit '1'
;;
esac
diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst
index 8fd3ef3..ba90aa2 100755
--- a/debian/x2goserver.preinst
+++ b/debian/x2goserver.preinst
@@ -22,7 +22,7 @@ case "${1}" in
'abort-upgrade')
;;
*)
- echo "preinst called with unknown argument \`${1}'" >&2
+ echo "preinst called with unknown argument '${1}'" >&2
exit '1'
;;
esac
diff --git a/debian/x2goserver.prerm b/debian/x2goserver.prerm
index 99ebc5f..0bb6e91 100755
--- a/debian/x2goserver.prerm
+++ b/debian/x2goserver.prerm
@@ -26,7 +26,7 @@ case "${1}" in
:
;;
*)
- echo "${0}: didn't understand being called with \`${1}'" 1>&2
+ echo "${0}: didn't understand being called with '${1}'" 1>&2
exit '1'
;;
esac
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list