matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

__acl: we only care whether file is directory

Browse source
This commit is contained in:
ander 2019-04-16 14:51:26 +03:00
commit 2b5887bdbd
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/conf/type/__acl/explorer/file_type → cdist/conf/type/__acl/explorer/is_dir
View file

@ -23,7 +23,6 @@ acl_path="/$__object_id"
[ ! -e "$acl_path" ] && exit 0 [ ! -e "$acl_path" ] && exit 0
if [ -d "$acl_path" ] if [ -d "$acl_path" ]
then echo d then echo 1
elif [ -f "$acl_path" ] else echo 0
then echo f
fi fi

6
cdist/conf/type/__acl/gencode-remote
View file

@ -24,7 +24,7 @@ acl_path="/$__object_id"
os="$( cat "$__global/explorer/os" )" os="$( cat "$__global/explorer/os" )"
file_type="$( cat "$__object/explorer/file_type" )" is_dir="$( cat "$__object/explorer/is_dir" )"
acl_is="$( cat "$__object/explorer/acl_is" )" acl_is="$( cat "$__object/explorer/acl_is" )"
@ -38,7 +38,7 @@ do
echo "$parameter:$l" echo "$parameter:$l"
if [ -f "$__object/parameter/default" ] \ if [ -f "$__object/parameter/default" ] \
&& [ "$file_type" = 'd' ] && [ "$is_dir" = '1' ]
then echo "default:$parameter:$l" then echo "default:$parameter:$l"
fi fi
done < "$__object/parameter/$parameter" done < "$__object/parameter/$parameter"
@ -50,7 +50,7 @@ then
echo "mask::$l" echo "mask::$l"
if [ -f "$__object/parameter/default" ] \ if [ -f "$__object/parameter/default" ] \
&& [ "$file_type" = 'd' ] && [ "$is_dir" = '1' ]
then echo "default:mask::$l" then echo "default:mask::$l"
fi fi
fi fi