From 2b5887bdbd3229d75da48e32dc7e55b29b6abd54 Mon Sep 17 00:00:00 2001
From: Ander Punnar <ander@kvlt.ee>
Date: Tue, 16 Apr 2019 14:51:26 +0300
Subject: [PATCH] __acl: we only care whether file is directory

---
 cdist/conf/type/__acl/explorer/{file_type => is_dir} | 5 ++---
 cdist/conf/type/__acl/gencode-remote                 | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename cdist/conf/type/__acl/explorer/{file_type => is_dir} (94%)

diff --git a/cdist/conf/type/__acl/explorer/file_type b/cdist/conf/type/__acl/explorer/is_dir
similarity index 94%
rename from cdist/conf/type/__acl/explorer/file_type
rename to cdist/conf/type/__acl/explorer/is_dir
index f45e302b..d3080de6 100755
--- a/cdist/conf/type/__acl/explorer/file_type
+++ b/cdist/conf/type/__acl/explorer/is_dir
@@ -23,7 +23,6 @@ acl_path="/$__object_id"
 [ ! -e "$acl_path" ] && exit 0
 
 if [ -d "$acl_path" ]
-then echo d
-elif [ -f "$acl_path" ]
-then echo f
+then echo 1
+else echo 0
 fi
diff --git a/cdist/conf/type/__acl/gencode-remote b/cdist/conf/type/__acl/gencode-remote
index 88fc8ce0..a50174fa 100755
--- a/cdist/conf/type/__acl/gencode-remote
+++ b/cdist/conf/type/__acl/gencode-remote
@@ -24,7 +24,7 @@ acl_path="/$__object_id"
 
 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" )"
 
@@ -38,7 +38,7 @@ do
         echo "$parameter:$l"
 
         if [ -f "$__object/parameter/default" ] \
-            && [ "$file_type" = 'd' ]
+            && [ "$is_dir" = '1' ]
         then echo "default:$parameter:$l"
         fi
     done < "$__object/parameter/$parameter"
@@ -50,7 +50,7 @@ then
     echo "mask::$l"
 
     if [ -f "$__object/parameter/default" ] \
-        && [ "$file_type" = 'd' ]
+        && [ "$is_dir" = '1' ]
     then echo "default:mask::$l"
     fi
 fi