Mercurial > trustbridge
changeset 1177:53a02fbe2fc9
(issue112) Rename deinstaller to uninstaller
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Mon, 22 Sep 2014 11:51:59 +0200 (2014-09-22) |
parents | c8f698ca6355 |
children | 59b3c22a404c |
files | packaging/linux-createpackage.sh.in packaging/linux-installer.inc |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/packaging/linux-createpackage.sh.in Mon Sep 22 11:34:06 2014 +0200 +++ b/packaging/linux-createpackage.sh.in Mon Sep 22 11:51:59 2014 +0200 @@ -39,7 +39,7 @@ fi INSTALLER="@CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.sh" -UNINSTALLER="$TMPDIR/bin/trustbridge-deinstall.sh" +UNINSTALLER="$TMPDIR/bin/trustbridge-uninstall.sh" EXEFILES=("@CMAKE_BINARY_DIR@/cinst/trustbridge-certificate-installer" "@CMAKE_BINARY_DIR@/cinst/trustbridge-nss-installer"
--- a/packaging/linux-installer.inc Mon Sep 22 11:34:06 2014 +0200 +++ b/packaging/linux-installer.inc Mon Sep 22 11:51:59 2014 +0200 @@ -51,7 +51,7 @@ getxt " -p, --prefix=PATH install files in PATH\n" getxt " -f, --force install to given prefix, even when a current\n" getxt " installation with different prefix exists.\n" - getxt " -d, --deinstall deinstall files from current installation\n" + getxt " -u, --uninstall uninstall files from current installation\n" getxt " -s, --system create a system wide (de)installation\n" getxt " --help display this help and exit\n" getxt " --version output version information and exit\n" @@ -61,7 +61,7 @@ parse_args() { OPTS=`getopt \ - -l deinstall,update,show-after-update,force,help,prefix:,system,version \ + -l uninstall,update,show-after-update,force,help,prefix:,system,version \ -o d,f,p:,s -n "$ME" -- "$@"` [ $? -eq 0 ] || usage 23 @@ -81,7 +81,7 @@ FORCE=1 shift 1 ;; - --deinstall|-d) + --uninstall|-u) DEINSTALL=1 shift 1 ;; @@ -119,8 +119,8 @@ getxt "TrustBridge has been installed to: '%s'\n\n" "${instcfg[PREFIX]}" getxt "To remove the application and the root certificates it has inserted,\n" - getxt "call the deinstall command:\n" - echo " $RUNCMD ${instcfg[PREFIX]}/bin/trustbridge-deinstall.sh" + getxt "call the uninstall command:\n" + echo " $RUNCMD ${instcfg[PREFIX]}/bin/trustbridge-uninstall.sh" echo "#################################################################################" getxt "Press enter to launch '%s'\n" "${instcfg[PREFIX]}/bin/trustbridge" @@ -296,7 +296,7 @@ getxt "An existing installation (v%s) was detected!\n" "${oldinstcfg[VERSION]}" getxt "It is HIGHLY RECOMMENDED to accept the default prefix\n" getxt "to update the current installation.\n" - getxt "For a new prefix you should deinstall first!\n" + getxt "For a new prefix you should uninstall first!\n" fi until [ "${instcfg[PREFIX]}" ] ; do getxt "Select installation prefix for TrustBridge [%s]: " "${inst_default_prefix}"