diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-09-03 19:31:19 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-09-03 19:31:19 (GMT) |
| commit | 54a82868b7fa5ff72c13ea704fe3c009889384ff (patch) | |
| tree | 0214573f802399f7982d3a75a661f02ed0bffa54 /abs/core/keylaunch | |
| parent | 39576222150a6983f7ba63ba2583c8a5e7374aab (diff) | |
| download | linhes_pkgbuild-54a82868b7fa5ff72c13ea704fe3c009889384ff.zip linhes_pkgbuild-54a82868b7fa5ff72c13ea704fe3c009889384ff.tar.gz linhes_pkgbuild-54a82868b7fa5ff72c13ea704fe3c009889384ff.tar.bz2 | |
Merge remote-tracking branch 'origin/testing' into testing
# By Britney Fransen (10) and others
# Via Britney Fransen
* origin/testing:
mythdb-initial: add MiscStatusScript value to initial db. refs #845.
LinHES-system: remove dup .install
keylaunch: update .keylaunchrc to run mythtv-setup as user
rsyslog: increase log retention to 2 weeks
runit-scripts: enable cron logging to syslog
premake:initial inclusion. closes #801
libaacs-git:initial inclusion. closes #801
aacskeys:initial inclusion. closes #801
LinHES-system: Add scripts for misc status in MythWeb. closes #845.
linhes-scripts: tweak myth2mkv. Update version to 0.25-004
dvb-firmware: add xc5000c firmware. change xc5000 modprobe options. closes #844
v4l-dvb: update to snapshot from 20120828. refs #844
LinHES-system: update myth_status.py to work with tuners in error. closes #843
curlftpfs: Initial Inclusion.
linhes-scripts: minor changes to myth2mkv
mythtv:Bumped to latest fixes. Added ./configure items to close #842.
LinHES-config:7.4 rdt 9th anniversary release.
Conflicts:
abs/core/LinHES-config/LinHES-release
abs/core/LinHES-config/PKGBUILD
abs/core/LinHES-system/PKGBUILD
abs/core/keylaunch/PKGBUILD
abs/core/linhes-scripts/PKGBUILD
abs/core/mythdb-initial/PKGBUILD
abs/core/mythdb-initial/mc.sql
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
abs/core/runit-scripts/PKGBUILD
Diffstat (limited to 'abs/core/keylaunch')
| -rw-r--r-- | abs/core/keylaunch/example_rc | 2 | ||||
| -rw-r--r-- | abs/core/keylaunch/keylaunch.install | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/abs/core/keylaunch/example_rc b/abs/core/keylaunch/example_rc index 3f98fa6..5dd0f59 100644 --- a/abs/core/keylaunch/example_rc +++ b/abs/core/keylaunch/example_rc @@ -10,7 +10,7 @@ key=*..Return:xterm -fn *-18-* key=..*x:/usr/LH/bin/tvterm.sh -key=..*s:sudo /usr/bin/mythtv-setup +key=..*s:/usr/bin/mythtv-setup key=..*u:/usr/LH/bin/unclutter-toggle.sh key=.**u:/usr/LH/bin/unclutter-toggle.sh key=..*h:/usr/MythVantage/bin/mythinstall -H diff --git a/abs/core/keylaunch/keylaunch.install b/abs/core/keylaunch/keylaunch.install index 42bc9eb..faa176b 100644 --- a/abs/core/keylaunch/keylaunch.install +++ b/abs/core/keylaunch/keylaunch.install @@ -13,7 +13,9 @@ post_install() { then echo "setting symlink for keylaunch" ln -s /etc/keylaunchrc $MHOME/.keylaunchrc -fi + fi + echo "updating .keylaunchrc to run mythtv-setup as user" + sed -i 's/key=..*s:sudo\ \/usr\/bin\/mythtv-setup/key=..*s:\/usr\/bin\/mythtv-setup/g' $MHOME/.keylaunchrc } # arg 1: the new package version |