[PATCH 1 of 5] Set config dir used by trustbridge-tray-starter at runtime

Wald Commits scm-commit at wald.intevation.org
Tue Jul 8 11:36:43 CEST 2014


# HG changeset patch
# User Sascha Wilde <wilde at intevation.de>
# Date 1404489983 -7200
# Node ID 654a8ca9d5b4b577f16488e2bfe98cf003c6c34c
# Parent  7c1f34115ede74f0b0275a497fb7c989427ada28
Set config dir used by trustbridge-tray-starter at runtime.

diff -r 7c1f34115ede -r 654a8ca9d5b4 packaging/linux-installer.inc.in
--- a/packaging/linux-installer.inc.in	Fri Jul 04 18:00:11 2014 +0200
+++ b/packaging/linux-installer.inc.in	Fri Jul 04 18:06:23 2014 +0200
@@ -341,8 +341,6 @@
 echo "Preparing trustbridge-tray-starter ..."
 sed -i "/^PREFIX=/c\PREFIX='${instcfg[PREFIX]}'" \
     "${instcfg[PREFIX]}/bin/trustbridge-tray-starter.sh"
-sed -i "/^CFGDIR=/c\CFGDIR='${instcfg_path}'" \
-    "${instcfg[PREFIX]}/bin/trustbridge-tray-starter.sh"
 
 echo "Setting up cronjob ..."
 setup_cronjob
diff -r 7c1f34115ede -r 654a8ca9d5b4 ui/trustbridge-tray-starter.sh
--- a/ui/trustbridge-tray-starter.sh	Fri Jul 04 18:00:11 2014 +0200
+++ b/ui/trustbridge-tray-starter.sh	Fri Jul 04 18:06:23 2014 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PREFIX=""
-CFGDIR=""
+CFGDIR="${XDG_CONFIG_HOME:-$HOME/.config}/BSI"
 TBCMD="trustbridge --tray"
 XSET=/usr/bin/xset
 CONFIG="$CFGDIR/trustbridge-tray-starter.cfg"


More information about the Trustbridge-commits mailing list