Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/scripts/xinitrc
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/xinitrc')
-rw-r--r--scripts/xinitrc13
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/xinitrc b/scripts/xinitrc
index 6c733d5..fc0b266 100644
--- a/scripts/xinitrc
+++ b/scripts/xinitrc
@@ -7,10 +7,6 @@ unset SESSION_MANAGER
SCRIPTS_DIR=`dirname "$0"`
ROOT_DIR=`dirname "$SCRIPTS_DIR"`
-if [ ! -f $ROOT_DIR/config ]; then
- touch $ROOT_DIR/config
-fi
-
if [ ! -z $SUGAR_PROFILE ]; then
grep -q PROFILE $ROOT_DIR/config
if [ $? -eq 1 ]; then
@@ -19,7 +15,9 @@ if [ ! -z $SUGAR_PROFILE ]; then
fi
fi
-source $ROOT_DIR/config
+if [ -f $ROOT_DIR/config ]; then
+ source $ROOT_DIR/config
+fi
# Sugar doesn't handle multiple outputs properly. To avoid issues we keep the
# first output in the list returned by xrandr and turn off everything else.
@@ -38,7 +36,10 @@ do
fi
done
-echo $SUGAR_DOGTAIL
+if [ ! -z $RESOLUTION ]; then
+ xrandr -s $RESOLUTION
+fi
+
if [ ! -z $SUGAR_DOGTAIL ]; then
rm -rf ~/.sugar/dogtail
export SUGAR_PROFILE=dogtail