diff options
author | James Meyer <james.meyer@operamail.com> | 2012-04-15 18:09:52 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2012-04-15 18:09:52 (GMT) |
commit | fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0 (patch) | |
tree | 9b41479aa679f286ba72c516b8a1996b3851fa63 /abs/core/linhes-scripts/stop_xss.sh | |
parent | c4b1cc7f705de9b4d539e8bba18170607e2c93f9 (diff) | |
parent | ab2b92bf6743790902c68e764b7e28b4aa0a681a (diff) | |
download | linhes_pkgbuild-fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0.zip linhes_pkgbuild-fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0.tar.gz linhes_pkgbuild-fc98dbe17ad2e565b67a6c5ec715ab2bcca161f0.tar.bz2 |
Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing
Conflicts:
abs/core/LinHES-system/PKGBUILD
Diffstat (limited to 'abs/core/linhes-scripts/stop_xss.sh')
-rw-r--r-- | abs/core/linhes-scripts/stop_xss.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/abs/core/linhes-scripts/stop_xss.sh b/abs/core/linhes-scripts/stop_xss.sh index c600795..9d3772e 100644 --- a/abs/core/linhes-scripts/stop_xss.sh +++ b/abs/core/linhes-scripts/stop_xss.sh @@ -3,7 +3,7 @@ while [ 1=1 ]; do - if [ "$(pidof chromium)" -o "$(pidof huludesktop)" ] + if [ "$(pidof chromium)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)"] then xscreensaver-command -deactivate fi |