Mercurial > trustbridge
changeset 1206:55c13de88b1e
(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.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Tue, 23 Sep 2014 13:17:06 +0200 |
| parents | c536d031df2b |
| children | e79fc57f1f9c |
| files | packaging/linux-installer-uninstall.inc |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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