# HG changeset patch # User Andre Heinecke # Date 1411396320 -7200 # Node ID 292a25c34affc86af22894f7fae686addb942291 # Parent ec16e3d812781139109285199dd1e33d6dddb10b (issue110) Remove installation_prefix dialog diff -r ec16e3d81278 -r 292a25c34aff packaging/linux-installer.inc --- a/packaging/linux-installer.inc Mon Sep 22 16:31:31 2014 +0200 +++ b/packaging/linux-installer.inc Mon Sep 22 16:32:00 2014 +0200 @@ -300,27 +300,7 @@ fi if [ -z "${instcfg[PREFIX]}" ] ; then - - if [ "${oldinstcfg[PREFIX]}" ] ; then - inst_default_prefix="${oldinstcfg[PREFIX]}" - 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 uninstall first!\n" - fi - until [ "${instcfg[PREFIX]}" ] ; do - getxt "Select installation prefix for TrustBridge [%s]: " "${inst_default_prefix}" - read -e instcfg[PREFIX] - if echo "${instcfg[PREFIX]}" | grep -q '[~$"\\]' ; then - getxt "\nWARNING: The given path name contains special characters\n" - getxt "(one or more of %s )\n" "~ $ \" \\" - getxt "Please note that these characters are not expanded by the installer,\n" - getxt "the installation directory will be containing these characters verbatim.\n\n" - getxt "Do you really want to use %s as installation prefix?\n" "${instcfg[PREFIX]}" - yorn || { instcfg[PREFIX]="" ; continue ; } - fi - [ -z "${instcfg[PREFIX]}" ] && instcfg[PREFIX]="${inst_default_prefix}" - done + instcfg[PREFIX]="${inst_default_prefix}" else # Prefix was given on invocation: if [ "${oldinstcfg[PREFIX]}" -a \