Mercurial > trustbridge
comparison packaging/linux-installer-common.inc.in @ 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 | d824e6890a43 |
| children | 014586ef8a84 |
comparison
equal
deleted
inserted
replaced
| 1196:e978f655be34 | 1197:bfe305e09e2d |
|---|---|
| 131 instcfg_path="${CFGPATH}" | 131 instcfg_path="${CFGPATH}" |
| 132 instdata_path="${DATAPATH}" | 132 instdata_path="${DATAPATH}" |
| 133 autostart_path=${XDG_CONFIG_HOME:-~/.config/autostart} | 133 autostart_path=${XDG_CONFIG_HOME:-~/.config/autostart} |
| 134 startmenu_path=${XDG_DATA_HOME:-~/.local/share/applications} | 134 startmenu_path=${XDG_DATA_HOME:-~/.local/share/applications} |
| 135 if [ $DEINSTALL -eq 1 ] ; then | 135 if [ $DEINSTALL -eq 1 ] ; then |
| 136 if [ ! -r ${instcfg_path}/${INSTCFGNAME} ]; then | 136 if [ ! -r ${instcfg_path}/${INSTCFGNAME} ]; then |
| 137 if [ -r ${SYSCFGPATH}/${INSTCFGNAME} ]; then | 137 if [ -r ${SYSCFGPATH}/${INSTCFGNAME} ]; then |
| 138 # Fall back to system uninstallation if no user config found | 138 # Fall back to system uninstallation if no user config found |
| 139 SYSINST=1 | 139 SYSINST=1 |
| 140 init_vars | 140 init_vars |
| 141 check_priv | 141 check_priv |
| 142 fi | |
| 143 fi | 142 fi |
| 144 else | 143 fi |
| 145 # extra bin path not needed on deinstall: | |
| 146 extra_bin_path=`mktemp --tmpdir -d tmpbin.XXXXXXXXXX` | |
| 147 fi | 144 fi |
| 145 fi | |
| 146 if [ $DEINSTALL -eq 0 ]; then | |
| 147 # extra bin path not needed on deinstall: | |
| 148 extra_bin_path=`mktemp --tmpdir -d tmpbin.XXXXXXXXXX` | |
| 148 fi | 149 fi |
| 149 instcfg_file="${instcfg_path}/${INSTCFGNAME}" | 150 instcfg_file="${instcfg_path}/${INSTCFGNAME}" |
| 150 HOST_ARCH=$(uname -m) | 151 HOST_ARCH=$(uname -m) |
| 151 } | 152 } |
| 152 | 153 |