[PATCH 2 of 3] (issue112) Create extra_bin_path also when system wide installing
Wald Commits
scm-commit at wald.intevation.org
Mon Sep 22 19:06:29 CEST 2014
# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1411405520 -7200
# Node ID bfe305e09e2d2d326e639697c7bc66fbdb782c45
# Parent e978f655be34dc09ce76062866263923030a1ea7
(issue112) Create extra_bin_path also when system wide installing
diff -r e978f655be34 -r bfe305e09e2d packaging/linux-installer-common.inc.in
--- 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)
}
More information about the Trustbridge-commits
mailing list