__acl: combine two explorers into one

This commit is contained in:
ander 2019-04-19 13:48:24 +03:00
parent 86f45db1b9
commit 8729e39c21
3 changed files with 14 additions and 33 deletions

View file

@ -19,6 +19,13 @@
# #
if [ -e "/$__object_id" ] if [ -e "/$__object_id" ]
then echo 1 then
else echo 0 if [ -d "/$__object_id" ]
then echo directory
elif [ -f "/$__object_id" ]
then echo regular
else echo other
fi
else
echo missing
fi fi

View file

@ -1,26 +0,0 @@
#!/bin/sh -e
#
# 2018 Ander Punnar (ander-at-kvlt-dot-ee)
#
# This file is part of cdist.
#
# cdist 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 3 of the License, or
# (at your option) any later version.
#
# cdist 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 cdist. If not, see <http://www.gnu.org/licenses/>.
#
[ ! -e "/$__object_id" ] && exit 0
if [ -d "/$__object_id" ]
then echo 1
else echo 0
fi

View file

@ -18,17 +18,17 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
[ "$( cat "$__object/explorer/file_exists" )" = '0' ] && exit 0 file_is="$( cat "$__object/explorer/file_is" )"
[ "$file_is" = 'missing' ] && exit 0
os="$( cat "$__global/explorer/os" )" os="$( cat "$__global/explorer/os" )"
is_dir="$( cat "$__object/explorer/is_dir" )"
acl_is="$( cat "$__object/explorer/acl_is" )" acl_is="$( cat "$__object/explorer/acl_is" )"
acl_path="/$__object_id" acl_path="/$__object_id"
if [ -f "$__object/parameter/default" ] && [ "$is_dir" = '1' ] if [ -f "$__object/parameter/default" ] && [ "$file_is" = 'directory' ]
then then
set_default=1 set_default=1
else else
@ -46,7 +46,7 @@ do
do do
if echo "$acl" | awk -F: '{ print $NF }' | grep -Fq 'X' if echo "$acl" | awk -F: '{ print $NF }' | grep -Fq 'X'
then then
[ "$is_dir" = '1' ] && rep=x || rep=- [ "$file_is" = 'directory' ] && rep=x || rep=-
acl="$( echo "$acl" | sed "s/\(.*\)X/\1$rep/" )" acl="$( echo "$acl" | sed "s/\(.*\)X/\1$rep/" )"
fi fi