From a9134043abb76e6b926bd0e847e2d947a1ba1daa Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Jun 2013 09:18:05 +0200 Subject: [PATCH] Homeinit check for sha1sum when installing keymaps. --- .scripts/homeinit | 7 ++++--- .xkb/symbols/usex | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.scripts/homeinit b/.scripts/homeinit index f6d3313d..9212e4c7 100755 --- a/.scripts/homeinit +++ b/.scripts/homeinit @@ -1,7 +1,7 @@ #!/bin/sh ################################################################################ ## Home session initialization. -## 2013-06-13 +## 2013-06-14 ################################################################################ SOURCEDIR="$HOME/personal/dataperso" [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" @@ -38,10 +38,11 @@ ICIiIC1uYyAiJEAiCmVsc2UKICAgIGVtYWNzY2xpZW50IC1hICIiIC10ICIkQCIKZmkK fi fi - +## Advanced keymaps. They need to be in X11 shared dir to be loaded. installkeymap () { - if [ -f "$HOME/.xkb/symbols/$1" ] && [ ! -f "/usr/share/X11/xkb/symbols/$1" ]; then + if [ -f "$HOME/.xkb/symbols/$1" ] && ( [ ! -f "/usr/share/X11/xkb/symbols/$1" ] || \ + [ ! "$(sha1sum "$HOME/.xkb/symbols/$1" | cut -f1 -d' ')" = "$(sha1sum /usr/share/X11/xkb/symbols/$1 | cut -f1 -d ' ')" ] ); then echo "==> '$1' font (press Ctrl-D to skip)" sudo sh -c "install -m644 $HOME/.xkb/symbols/$1 /usr/share/X11/xkb/symbols/" echo diff --git a/.xkb/symbols/usex b/.xkb/symbols/usex index 9290bd26..6d1aee0e 100644 --- a/.xkb/symbols/usex +++ b/.xkb/symbols/usex @@ -9,8 +9,7 @@ // $ setxkbmap usex // This keyboard is based on Xorg's "us intl" with some improvements. -// TODO: direct nbsp, <>=, swap control and Caps Lock. -// ≤ ≥ ↓ ↑ ← → +// TODO: direct nbsp, swap control and Caps Lock, ≤ ≥ ↓ ↑ ← → // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓ // │ ~ ~ │ ! ¡ │ @ ˝ │ # ¯ │ $ ¤ │ % ¢ │ ^ ^ │ & ½ │ * ˛ │ ( ˘ │ ) ° │ _ ⋅ │ + ÷ ┃ ⌫ Back ┃