diff packaging/linux-installer.inc.in @ 1075:7e1fd6d96714

(issue109) Feedback improved. Shell translation updated.
author Bernhard Reiter <bernhard@intevation.de>
date Thu, 11 Sep 2014 10:18:46 +0200
parents 709a7633a2c6
children d619507d9e9f
line wrap: on
line diff
--- a/packaging/linux-installer.inc.in	Wed Sep 10 17:54:50 2014 +0200
+++ b/packaging/linux-installer.inc.in	Thu Sep 11 10:18:46 2014 +0200
@@ -243,26 +243,17 @@
   echo "#################################################################################"
   if [ $SYSINST -eq 1 ]; then
     getxt "System wide installation successful.\n"
+    RUNCMD="su -l $SUDO_USER -c "
   else
     getxt "Single user installation successful.\n"
+    RUNCMD=""
   fi
   getxt "TrustBridge has been installed to: '%s'\n\n" "${instcfg[PREFIX]}"
 
-  if [ $SYSINST -eq 1 ]; then
-    getxt "If you do not want to change the certificates of other users\n"
-    getxt "uninstall it with:\n"
-    echo "      'sudo $0 -d'"
-    getxt "And install it again without sudo:\n"
-    echo "       $0"
-    RUNCMD="su -l $SUDO_USER -c "
-  else
-    getxt "If you want to change the certificates of all users\n"
-    getxt "uninstall it with:\n"
-    echo "      '$0 -d'"
-    getxt "And install it again using sudo:\n"
-    echo "       sudo $0"
-    RUNCMD=""
-  fi
+  getxt "To remove the application and the root certificates it has inserted,"
+  getxt "call the deinstall command:"
+  echo "  $RUNCMD ${instcfg[PREFIX]}/bin/trustbridge-deinstall-TODO.sh"
+
   echo "#################################################################################"
   getxt "Press enter to launch '%s'\n" "${instcfg[PREFIX]}/bin/trustbridge"
   if [ $UPDATE -eq 0 ]; then

http://wald.intevation.org/projects/trustbridge/