commit 1a525e9a6fbf792b37733a078cfcef4cc981455e
parent f326e71b3a4c5044221dd63fb545a03ccb908796
Author: Antoine Amarilli <a3nm@a3nm.net>
Date: Sun, 18 Oct 2015 18:42:51 +0200
Merge branch 'master' of a3nm.net:git/mybin
Diffstat:
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dropbox b/dropbox
@@ -38,7 +38,8 @@ then
exit 2
fi
-BADL=$(xhost | sed 1d | grep -v "SI:localuser:$ID" | wc -l)
+BADL=$(xhost | sed 1d | grep -v "SI:localuser:$ID" |
+ grep -vE "SI:localuser:(browser|browser2|bitcoin)" | wc -l)
if [ $BADL -gt 0 ]
then
echo "bad xhost permissions:"
@@ -117,7 +118,7 @@ fi
# now everything is in order
-grep -qs "^bindfs $ENDPOINT" /proc/mounts || (
+grep -qs "^bindfs $ENDPOINT " /proc/mounts || (
echo "$ENDPOINT was not mounted, mounting it"
sudo bindfs --create-for-user=$(id -u dropbox) \
--create-for-group=$(id -g dropbox) \
diff --git a/skype b/skype
@@ -37,7 +37,8 @@ then
exit 2
fi
-BADL=$(xhost | sed 1d | grep -v "SI:localuser:$ID" | wc -l)
+BADL=$(xhost | sed 1d | grep -v "SI:localuser:$ID" |
+ grep -vE 'SI:localuser:(browser|browser2|bitcoin)' | wc -l)
if [ $BADL -gt 0 ]
then
echo "bad xhost permissions:"
diff --git a/startup b/startup
@@ -27,3 +27,9 @@ xhost | sed 1d | grep -v `whoami` | while read l; do
xhost "-$l"
done
+# for now, browser can access the X server
+# TODO: use Xpra
+xhost +si:localuser:browser
+xhost +si:localuser:browser2
+xhost +si:localuser:bitcoin
+