Mercurial > trustbridge
changeset 1197:bfe305e09e2d
(issue112) Create extra_bin_path also when system wide installing
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Mon, 22 Sep 2014 19:05:20 +0200 |
parents | e978f655be34 |
children | c072dda0b541 |
files | packaging/linux-installer-common.inc.in |
diffstat | 1 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/packaging/linux-installer-common.inc.in Mon Sep 22 18:59:01 2014 +0200 +++ b/packaging/linux-installer-common.inc.in Mon Sep 22 19:05:20 2014 +0200 @@ -133,19 +133,20 @@ autostart_path=${XDG_CONFIG_HOME:-~/.config/autostart} startmenu_path=${XDG_DATA_HOME:-~/.local/share/applications} if [ $DEINSTALL -eq 1 ] ; then - if [ ! -r ${instcfg_path}/${INSTCFGNAME} ]; then - if [ -r ${SYSCFGPATH}/${INSTCFGNAME} ]; then - # Fall back to system uninstallation if no user config found - SYSINST=1 - init_vars - check_priv - fi + if [ ! -r ${instcfg_path}/${INSTCFGNAME} ]; then + if [ -r ${SYSCFGPATH}/${INSTCFGNAME} ]; then + # Fall back to system uninstallation if no user config found + SYSINST=1 + init_vars + check_priv fi - else - # extra bin path not needed on deinstall: - extra_bin_path=`mktemp --tmpdir -d tmpbin.XXXXXXXXXX` + fi fi fi + if [ $DEINSTALL -eq 0 ]; then + # extra bin path not needed on deinstall: + extra_bin_path=`mktemp --tmpdir -d tmpbin.XXXXXXXXXX` + fi instcfg_file="${instcfg_path}/${INSTCFGNAME}" HOST_ARCH=$(uname -m) }