diff options
author | Niels Thykier <niels@thykier.net> | 2018-04-07 19:05:34 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2018-04-07 19:05:34 +0000 |
commit | d2a3b1587bee63f5019fab23725bf1a096e01dab (patch) | |
tree | d52457dd8df2344f5c61194beb1636d2c898a298 /autoscripts | |
parent | c7a3a4bd757a40d3834c000af2917a381eed9c9d (diff) | |
download | debhelper-d2a3b1587bee63f5019fab23725bf1a096e01dab.tar.gz |
dh_usrlocal: Use default owner+mode from Policy v4.1.4
Signed-off-by: Niels Thykier <niels@thykier.net>
Diffstat (limited to 'autoscripts')
-rw-r--r-- | autoscripts/postinst-usrlocal | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/autoscripts/postinst-usrlocal b/autoscripts/postinst-usrlocal index ca207488..e856e0f8 100644 --- a/autoscripts/postinst-usrlocal +++ b/autoscripts/postinst-usrlocal @@ -1,12 +1,25 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then ( + default_mode=0755 + default_user=root + default_group=root + if [ -e /etc/staff-group-for-usr-local ]; then + default_mode=02775 + default_group=staff + fi while read line; do set -- $line dir="$1"; mode="$2"; user="$3"; group="$4" + if [ "$mode" = "default" ]; then + mode="$default_mode" + user="$default_user" + group="$default_group" + fi if [ ! -e "$dir" ]; then if mkdir "$dir" 2>/dev/null; then - chown "$user":"$group" "$dir" - chmod "$mode" "$dir" + if chown "$user":"$group" "$dir" ; then + chmod "$mode" "$dir" || true + fi fi fi done |