From 779cf3d468caef74402b7bf67cca4bb0eb8318ff Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Thu, 18 May 2017 11:48:15 +0100 Subject: [PATCH] remove remaining references to scripts directory (#24771) The packaging scripts still referenced the scripts directory which is now removed. --- distribution/src/main/packaging/scripts/postinst | 1 - distribution/src/main/packaging/scripts/prerm | 6 ------ 2 files changed, 7 deletions(-) diff --git a/distribution/src/main/packaging/scripts/postinst b/distribution/src/main/packaging/scripts/postinst index 86f2baadb94..bb14975e63b 100644 --- a/distribution/src/main/packaging/scripts/postinst +++ b/distribution/src/main/packaging/scripts/postinst @@ -110,7 +110,6 @@ chown -R elasticsearch:elasticsearch /var/lib/elasticsearch chown -R elasticsearch:elasticsearch /var/log/elasticsearch chown -R root:elasticsearch /etc/elasticsearch chmod 0750 /etc/elasticsearch -chmod 0750 /etc/elasticsearch/scripts if [ -f /etc/sysconfig/elasticsearch ]; then chmod 0660 /etc/sysconfig/elasticsearch diff --git a/distribution/src/main/packaging/scripts/prerm b/distribution/src/main/packaging/scripts/prerm index bca03b25766..632e59a26ea 100644 --- a/distribution/src/main/packaging/scripts/prerm +++ b/distribution/src/main/packaging/scripts/prerm @@ -79,12 +79,6 @@ if [ "$REMOVE_SERVICE" = "true" ]; then if command -v update-rc.d >/dev/null; then update-rc.d elasticsearch remove >/dev/null || true fi - - SCRIPTS_DIR="/etc/elasticsearch/scripts" - # delete the scripts directory if and only if empty - if [ -d "$SCRIPTS_DIR" ]; then - rmdir --ignore-fail-on-non-empty "$SCRIPTS_DIR" - fi fi