[PATCH] (issue133) Always use CFGPATH to deinstall configuration

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1411471026 -7200
# Node ID 55c13de88b1ebf7d26c3375a08aff6c3f45c18a2
# Parent  c536d031df2b9411732e8f4c22c23cbecb7d33bb
(issue133) Always use CFGPATH to deinstall configuration

    This location is the same for system wide and user wide
    installation, while sysconfig path is /etc/TrustBridge for
    system wide installation.

diff -r c536d031df2b -r 55c13de88b1e packaging/linux-installer-uninstall.inc
--- a/packaging/linux-installer-uninstall.inc	Tue Sep 23 15:06:49 2014 +0200
+++ b/packaging/linux-installer-uninstall.inc	Tue Sep 23 13:17:06 2014 +0200
@@ -50,8 +50,8 @@
     getxt "No certificate list found.  Nothing to do.\n"
   fi
 
-  rm_files "${instcfg_path}/TrustBridge.ini"
-  rm_empty_dirs "$instcfg_path"
+  rm_files "${CFGPATH}/TrustBridge.ini"
+  rm_empty_dirs "${CFGPATH}"
 }
 
 deinstall_etc()
@@ -62,12 +62,13 @@
   getxt "Removing certificate lists from: %s:\n" "$instdata_path"
   rm_files "$instdata_path"/list-2*.txt
 
-  local tbcfg_files=( "${instcfg_path}/trustbridge-tray-starter.cfg"
+  local tbcfg_files=( "${CFGPATH}/trustbridge-tray-starter.cfg"
                       "$instcfg_file" )
 
   getxt "Removing configuration files:\n"
   rm_files "${tbcfg_files[@]}"
   rm_empty_dirs "$instcfg_path"
+  rm_empty_dirs "${CFGPATH}"
 
   getxt "Removing PID file from: %s:\n" "$instdata_path"
   rm_files "$instdata_path"/*.pid