fix a pile of lintian warnings

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644 (file)
index b747b98..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-sudo source: maintainer-script-lacks-debhelper-token debian/sudo.postinst
-sudo source: maintainer-script-lacks-debhelper-token debian/sudo-ldap.postinst

diff --git a/debian/sudo-ldap.lintian b/debian/sudo-ldap.lintian
index 56e77ef2d758962f266fddc3659bbf13cf49e468..10ce84dd5c2ee384c90536a1d19a6a4e8bb6d476 100644 (file)
--- a/debian/sudo-ldap.lintian
+++ b/debian/sudo-ldap.lintian
@@ -1,3 +1,4 @@
 sudo-ldap: non-standard-file-perm etc/sudoers.d/README 0440 != 0644
 sudo-ldap: setuid-binary usr/bin/sudo 4755 root/root
 sudo-ldap: setuid-binary usr/bin/sudoedit 4755 root/root
+sudo-ldap: read-in-maintainer-script

diff --git a/debian/sudo-ldap.postinst b/debian/sudo-ldap.postinst
index da4a83c326330e435bcaada3808b05b99f9302cc..7394d52256d3e1615c0afe11dd2a842448b82bf0 100644 (file)
--- a/debian/sudo-ldap.postinst
+++ b/debian/sudo-ldap.postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # remove old link
 
 if [ -L /etc/alternatives/sudo ]; then
@@ -44,18 +46,18 @@ rm -f /etc/sudoers.pre-conffile
 
 # make sure we have a sudo group
 
-[ -n "`/usr/bin/getent group sudo`" ] && exit 0   # we're finished if there is a group sudo:
+[ -n "`getent group sudo`" ] && exit 0   # we're finished if there is a group sudo:
 
 # start search with gid 27
 gid="27"
-while [ -n "`/usr/bin/getent group $gid | /usr/bin/cut -d: -f3`" ];do
-       gid=`/usr/bin/expr $gid + 1`
+while [ -n "`getent group $gid | cut -d: -f3`" ];do
+       gid=`expr $gid + 1`
 done
 
 
 if [ "$gid" -ne "27" ];then
        echo "On Debian we normally use gid 27 for 'sudo'."
-       gname="`/usr/bin/getent group 27 | /usr/bin/cut -d: -f1`"
+       gname="`getent group 27 | cut -d: -f1`"
        echo "However, on your system gid 27 is group '$gname'."
        echo ""
        echo "Would you like me to stop configuring sudo so that you can change this?"; 
@@ -64,7 +66,7 @@ if [ "$gid" -ne "27" ];then
                read ans
                [ "$ans" = "" ] && break
                if [ "$ans" = "yes" -o "$ans" = "YES" ];then
-                       echo "'dpkg --pending --configure' will restart the configuration.\n\n"
+                       echo "\'dpkg --pending --configure\' will restart the configuration.\n\n"
                        exit 1;
                fi
                echo "Please enter exactly 'yes' to stop, or press the enter key to continue without stopping"

diff --git a/debian/sudo.lintian b/debian/sudo.lintian
index 0b4b58cfe1af6546525e827cc393e58fb103a807..951d42996ff5c1088b62dc6972e1c3cb407cab6a 100644 (file)
--- a/debian/sudo.lintian
+++ b/debian/sudo.lintian
@@ -1,3 +1,4 @@
 sudo: non-standard-file-perm etc/sudoers.d/README 0440 != 0644
 sudo: setuid-binary usr/bin/sudo 4755 root/root
 sudo: setuid-binary usr/bin/sudoedit 4755 root/root
+sudo: read-in-maintainer-script

diff --git a/debian/sudo.postinst b/debian/sudo.postinst
index 3ce5fc56b37150abab2132cf0aa0e14bad643749..77c11ccdb5ee1bacaed9231853eca501f3f1b621 100644 (file)
--- a/debian/sudo.postinst
+++ b/debian/sudo.postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # remove old link
 
 if [ -L /etc/alternatives/sudo ]; then
@@ -32,18 +34,18 @@ rm -f /etc/sudoers.pre-conffile
 
 # make sure we have a sudo group
 
-[ -n "`/usr/bin/getent group sudo`" ] && exit 0   # we're finished if there is a group sudo:
+[ -n "`getent group sudo`" ] && exit 0   # we're finished if there is a group sudo:
 
 # start search with gid 27
 gid="27"
-while [ -n "`/usr/bin/getent group $gid | /usr/bin/cut -d: -f3`" ];do
-       gid=`/usr/bin/expr $gid + 1`
+while [ -n "`getent group $gid | cut -d: -f3`" ];do
+       gid=`expr $gid + 1`
 done
 
 
 if [ "$gid" -ne "27" ];then
        echo "On Debian we normally use gid 27 for 'sudo'."
-       gname="`/usr/bin/getent group 27 | /usr/bin/cut -d: -f1`"
+       gname="`getent group 27 | cut -d: -f1`"
        echo "However, on your system gid 27 is group '$gname'."
        echo ""
        echo "Would you like me to stop configuring sudo so that you can change this?"; 
@@ -52,7 +54,7 @@ if [ "$gid" -ne "27" ];then
                read ans
                [ "$ans" = "" ] && break
                if [ "$ans" = "yes" -o "$ans" = "YES" ];then
-                       echo "'dpkg --pending --configure' will restart the configuration.\n\n"
+                       echo "\'dpkg --pending --configure\' will restart the configuration.\n\n"
                        exit 1;
                fi
                echo "Please enter exactly 'yes' to stop, or press the enter key to continue without stopping"