[DRE-commits] [diaspora-installer] 01/02: make postrm idempotent

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 453af70fd9efaf60194a60789481c03eb7bb72bc
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Apr 26 12:52:10 2017 +0530

    make postrm idempotent
---
 debian/diaspora-common.postrm | 16 ++++++++++++----
 debian/postrm                 | 12 +++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/debian/diaspora-common.postrm b/debian/diaspora-common.postrm
index 9ac8346..2f48613 100644
--- a/debian/diaspora-common.postrm
+++ b/debian/diaspora-common.postrm
@@ -19,7 +19,9 @@ case "$1" in
     # been purged.
     :
     # stop the service if running
-    service diaspora status >/dev/null && service diaspora stop
+    if [ service diaspora status >/dev/null ]; then
+      service diaspora stop
+    fi
 
     rm -rf /var/lib/diaspora-common/diaspora.conf
     rm -rf /var/lib/diaspora-common/database.yml
@@ -55,17 +57,23 @@ case "$1" in
         diaspora_user_home=/var/lib/diaspora
         if [ -d ${diaspora_user_home} ]; then
           for i in  public app-assets Gemfile.lock .bundle vendor; do
-            test -e ${diaspora_user_home}/$i && rm -rf ${diaspora_user_home}/$i
+            if [ -e ${diaspora_user_home}/$i ]; then
+              rm -rf ${diaspora_user_home}/$i
+            fi
           done
         fi
         diaspora_home=/usr/share/diaspora
         if [ -d ${diaspora_home} ]; then
           for i in db bin app/assets; do
-            test -e ${diaspora_home}/$i && rm -rf ${diaspora_home}/$i
+            if [ -e ${diaspora_home}/$i ]; then
+              rm -rf ${diaspora_home}/$i
+            fi
           done
         fi
         echo "Removing user: diaspora"
-        id -u diaspora && userdel -r diaspora
+        if [ id -u diaspora ]; then
+          userdel -r diaspora
+        fi
       fi
 
       # Remove my changes to the db.
diff --git a/debian/postrm b/debian/postrm
index 6217e74..49ba96c 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -22,7 +22,9 @@ case "$1" in
     # been purged.
     :
     # stop the service if running
-    service diaspora status >/dev/null && service diaspora stop
+    if [ service diaspora status >/dev/null ]; then
+      service diaspora stop
+    fi
 
     # These symlinked paths are managed by diaspora-common
     backup_suffix=$(openssl rand -hex 4)
@@ -35,7 +37,9 @@ case "$1" in
     done
 
     for i in ${diaspora_symlinks_list}; do
-      test -e ${diaspora_home}/$i && mv ${diaspora_home}/$i ${backup_dir}/$i
+      if [ -e ${diaspora_home}/$i ]; then
+        mv ${diaspora_home}/$i ${backup_dir}/$i
+      fi
     done
     rm -rf ${diaspora_home}/*
     
@@ -44,7 +48,9 @@ case "$1" in
       mkdir -p ${diaspora_home}/$i
     done
     for i in ${diaspora_symlinks_list}; do
-      test -e ${backup_dir}/$i && mv ${backup_dir}/$i ${diaspora_home}/$i
+      if [ -e ${backup_dir}/$i ]; then
+        mv ${backup_dir}/$i ${diaspora_home}/$i
+      fi
     done
     rm -rf ${backup_dir}
     rm -rf /var/cache/diaspora-installer

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git