Skip to content

Cleanup plugin bin directories #41907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 10, 2019
Merged

Cleanup plugin bin directories #41907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a3c138a
Update TLS ciphers and protocols for JDK 11 (#41808)
jaymode May 7, 2019
502b395
Correct spelling of MockLogAppender.PatternSeenEventExpectation (#41893)
romseygeek May 7, 2019
48d7a0c
Cleanup plugin bin directories
rjernst May 7, 2019
02e8cc7
use simpler assertion
rjernst May 7, 2019
6e5f299
consolidate test
rjernst May 7, 2019
b69ae0e
Merge branch 'master' into packaging_cleanup2
rjernst May 8, 2019
e7b6f5d
remove bad files
rjernst May 8, 2019
8d10be1
Merge branch 'master' into packaging_cleanup2
rjernst May 8, 2019
9406888
fix typo
rjernst May 8, 2019
7afb43e
remove debug
rjernst May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion distribution/packages/src/common/scripts/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# On RedHat,
# $1=0 : indicates a removal
# $1=1 : indicates an upgrade

REMOVE_DIRS=false
REMOVE_USER_AND_GROUP=false

Expand Down Expand Up @@ -55,6 +54,13 @@ if [ "$REMOVE_DIRS" = "true" ]; then
echo " OK"
fi

# plugins may have contained bin files
if [ -d /usr/share/elasticsearch/bin ]; then
echo -n "Deleting plugin bin directories..."
rm -rf /usr/share/elasticsearch/bin
echo " OK"
fi

if [ -d /var/run/elasticsearch ]; then
echo -n "Deleting PID directory..."
rm -rf /var/run/elasticsearch
Expand Down
3 changes: 3 additions & 0 deletions qa/vagrant/src/main/java/org/elasticsearch/packaging/test/PackageTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ public void test40StartServer() throws Exception {
public void test50Remove() throws Exception {
assumeThat(installation, is(notNullValue()));

// add fake bin directory as if a plugin was installed
Files.createDirectories(installation.bin.resolve("myplugin"));

remove(distribution());

// removing must stop the service
Expand Down