From 0827eefbaea40d9197fdfd126c914a908fa14916 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Fri, 22 Feb 2013 15:10:39 +0100 Subject: Fix typo in set_xresources filename --- .config/systemd/user/xrdb.service | 2 +- .scripts/set_xresources.sh | 12 ++++++++++++ .scripts/set_xressources.sh | 12 ------------ .xinitrc | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100755 .scripts/set_xresources.sh delete mode 100755 .scripts/set_xressources.sh diff --git a/.config/systemd/user/xrdb.service b/.config/systemd/user/xrdb.service index 536bff0..539ffa5 100644 --- a/.config/systemd/user/xrdb.service +++ b/.config/systemd/user/xrdb.service @@ -5,7 +5,7 @@ Wants=xorg.target [Service] Type=oneshot -ExecStart=/bin/sh %h/.scripts/set_xressources.sh +ExecStart=/bin/sh %h/.scripts/set_xresources.sh [Install] WantedBy=graphical.target diff --git a/.scripts/set_xresources.sh b/.scripts/set_xresources.sh new file mode 100755 index 0000000..a51650b --- /dev/null +++ b/.scripts/set_xresources.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +#find ~/.config/ \ +# -mindepth 2 -maxdepth 2 \ +# -type f -iname "*.xdefaults" \ +# -exec xrdb -merge {} \; + +# It is faster to concat first and execute xrdb only once. +find ~/.config/ \ + -mindepth 2 -maxdepth 2 \ + -type f -iname "*.xdefaults" \ + -exec cat {} + | xrdb -merge diff --git a/.scripts/set_xressources.sh b/.scripts/set_xressources.sh deleted file mode 100755 index a51650b..0000000 --- a/.scripts/set_xressources.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -#find ~/.config/ \ -# -mindepth 2 -maxdepth 2 \ -# -type f -iname "*.xdefaults" \ -# -exec xrdb -merge {} \; - -# It is faster to concat first and execute xrdb only once. -find ~/.config/ \ - -mindepth 2 -maxdepth 2 \ - -type f -iname "*.xdefaults" \ - -exec cat {} + | xrdb -merge diff --git a/.xinitrc b/.xinitrc index 1a04931..8333572 100644 --- a/.xinitrc +++ b/.xinitrc @@ -4,7 +4,7 @@ #xset r rate 250 50 # Xdefault is splitted so load the splitted files at startup -[[ -x ~/.scripts/set_xressources.sh ]] && ~/.scripts/set_xressources.sh +[[ -x ~/.scripts/set_xresources.sh ]] && ~/.scripts/set_xresources.sh [[ -x ~/.scripts/toggle_touchpad.sh ]] && ~/.scripts/toggle_touchpad.sh -- cgit