Merge pull request #875 from aydemir/master

xinit
2015-11-22 11:56:59 +02:00
parent beee5c07c2 1fcaef6f0f
commit 3fa0290b6d
4 changed files with 19 additions and 2 deletions
@@ -0,0 +1 @@
+TkTheme: clearlooks
@@ -0,0 +1,12 @@
+SYSRESOURCES=/etc/X11/Xdefaults
+USERRESOURCES=$HOME/.Xdefaults
+
+if [ -f $SYSRESOURCES ]; then
+    xrdb -load  $SYSRESOURCES
+fi
+
+if [ -f "$USERRESOURCES" ]; then
+    xrdb -load "$USERRESOURCES"
+else
+	cp $SYSRESOURCES $USERRESOURCES && xrdb -load  "$USERRESOURCES"
+fi
@@ -1,4 +1,3 @@
-
 SYSRESOURCES=/etc/X11/Xresources
 USERRESOURCES=$HOME/.Xresources

@@ -8,4 +7,6 @@ fi

 if [ -f "$USERRESOURCES" ]; then
    xrdb -merge "$USERRESOURCES"
-fi
+else
+	cp $SYSRESOURCES $USERRESOURCES && xrdb -merge "$USERRESOURCES"
+fi
@@ -33,6 +33,7 @@
        </RuntimeDependencies>
        <Files>
            <Path fileType="config">/etc/X11/Xresources</Path>
+            <Path fileType="config">/etc/X11/Xdefaults</Path>
            <Path fileType="config">/etc/X11/xinit</Path>
            <Path fileType="executable">/usr/bin</Path>
            <Path fileType="executable">/usr/lib/X11/xinit</Path>
@@ -45,9 +46,11 @@
            <AdditionalFile owner="root" permission="0644" target="/etc/X11/xinit/xserverrc">xserverrc</AdditionalFile>
            <AdditionalFile owner="root" permission="0644" target="/usr/lib/X11/xinit/xserverrc">xserverrc</AdditionalFile>
            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xresources" >Xresources</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xdefaults" >Xdefaults</AdditionalFile>
            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-localuser.sh">xinitrc.d/localuser.sh</AdditionalFile>
            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-xdg-runtime-dir.sh">xinitrc.d/xdg-runtime-dir.sh</AdditionalFile>
            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-Xresources.sh">xinitrc.d/Xresources.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-Xdefaults.sh">xinitrc.d/Xdefaults.sh</AdditionalFile>
            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/10-xkb.sh">xinitrc.d/xkb.sh</AdditionalFile>
            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/20-startup.sh">xinitrc.d/startup.sh</AdditionalFile>
            <AdditionalFile owner="root" permission="0755" target="/etc/X11/xinit/xinitrc.d/25-environment.sh">xinitrc.d/environment.sh</AdditionalFile>