RANGER-2685 : check if there are files in ews/logs

Signed-off-by: Pradeep <pradeep@apache.org>
apache · Jan 16, 2020 · 3e5ccd6 · 3e5ccd6
1 parent 7cfef39
commit 3e5ccd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/security-admin/scripts/set_globals.sh b/security-admin/scripts/set_globals.sh
@@ -104,7 +104,9 @@ ln -sf /etc/ranger/admin/conf ews/webapp/WEB-INF/classes/conf
 if [ ! -d /var/log/ranger/admin ]; then
 	mkdir -p /var/log/ranger/admin
 	if [ -d ews/logs ]; then
-		cp -r ews/logs/* /var/log/ranger/admin
+		if [ -n "$(ls ews/logs/ 2>/dev/null)" ]; then
+			cp -r ews/logs/* /var/log/ranger/admin
+		fi
 	fi
 fi
 

diff --git a/unixauthservice/scripts/set_globals.sh b/unixauthservice/scripts/set_globals.sh
@@ -97,7 +97,9 @@ ln -sf /etc/ranger/usersync/conf conf
 if [ ! -d /var/log/ranger/usersync ]; then
 	mkdir -p /var/log/ranger/usersync
 	if [ -d ews/logs ]; then
-		cp -r ews/logs/* /var/log/ranger/usersync
+		if [ -n "$(ls ews/logs/ 2>/dev/null)" ]; then
+			cp -r ews/logs/* /var/log/ranger/usersync
+		fi
 	fi
 fi