From f0ead4a032399f8f04dcf49bc5fa2e6331d0f18c Mon Sep 17 00:00:00 2001 From: Eugene Ignatiev Date: Sat, 14 Jun 2014 17:10:22 +0300 Subject: [PATCH 1/3] Fixed rpm postuninstall scriptlet which erroneously deletes user/group during rpm upgrade. --- .../typesafe/sbt/packager/rpm/postuninstall | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall b/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall index 13c6a24ee..a85f9609a 100644 --- a/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall +++ b/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall @@ -1,12 +1,16 @@ # Removing system user/group : ${{daemon_user}} and ${{daemon_group}} -echo "Try deleting system user and group [${{daemon_user}}:${{daemon_group}}]" -if getent passwd | grep -q "^${{daemon_user}}:"; +if [[ $1 == 0 ]] then - echo "Deleting system user: ${{daemon_user}}" - userdel ${{daemon_user}} -fi -if getent group | grep -q "^${{daemon_group}}:" ; -then - echo "Deleting system group: ${{daemon_group}}" - groupdel ${{daemon_group}} + echo "Try deleting system user and group [${{daemon_user}}:${{daemon_group}}]" + if getent passwd | grep -q "^${{daemon_user}}:"; + then + echo "Deleting system user: ${{daemon_user}}" + userdel ${{daemon_user}} + fi + if getent group | grep -q "^${{daemon_group}}:" ; + then + echo "Deleting system group: ${{daemon_group}}" + groupdel ${{daemon_group}} + fi fi + From e96d1c1e390b4dfb0a8347125bf0a84f8c0516ed Mon Sep 17 00:00:00 2001 From: Eugene Ignatiev Date: Sat, 14 Jun 2014 21:21:09 +0300 Subject: [PATCH 2/3] Added clarification to usage of postuninstall scriptlet variable. --- src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall b/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall index a85f9609a..ce5fc713f 100644 --- a/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall +++ b/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall @@ -1,4 +1,7 @@ # Removing system user/group : ${{daemon_user}} and ${{daemon_group}} + +# Scriplet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax +# $1 == 1 is upgrade and $1 == 0 is uninstall if [[ $1 == 0 ]] then echo "Try deleting system user and group [${{daemon_user}}:${{daemon_group}}]" From 8c0877d03cb42a1bcc38e2a89ec2dc6c3344fcd3 Mon Sep 17 00:00:00 2001 From: Eugene Ignatiev Date: Sat, 14 Jun 2014 21:28:25 +0300 Subject: [PATCH 3/3] Fixed a typo in a comment. --- src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall b/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall index ce5fc713f..0d3d61f14 100644 --- a/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall +++ b/src/main/resources/com/typesafe/sbt/packager/rpm/postuninstall @@ -1,6 +1,6 @@ # Removing system user/group : ${{daemon_user}} and ${{daemon_group}} -# Scriplet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax +# Scriptlet syntax: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Syntax # $1 == 1 is upgrade and $1 == 0 is uninstall if [[ $1 == 0 ]] then