Skip to content

Fix/Optimize Linux Install Script #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rfiga wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix/Optimize Linux Install Script #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions install/linux/x_keyboard_extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
TARGET_SYM := /usr/share/X11/xkb/symbols/us
XKB_BASE := /usr/share/X11/xkb
TARGET_SYM := $(XKB_BASE)/symbols/us
TARGET_RULE := $(XKB_BASE)/rules/evdev.xml
SOURCE_SYM := usr-share-X11-xkb-symbols-us
TARGET_RULE := /usr/share/X11/xkb/rules/evdev.xml
SOURCE_RULE := usr-share-X11-xkb-rules-evdev

all: reinstall

install: $(SOURCE_SYM) $(TARGET_SYM) $(SOURCE_RULE) $(TARGET_RULE)
echo '//ENGRAM//BEGIN' >> $(TARGET_SYM)
cat $(SOURCE_SYM) >> $(TARGET_SYM)
echo '//ENGRAM//END' >> $(TARGET_SYM)
sed -i "$$(awk '/variantList/ {print NR; exit}' $(TARGET_RULE)) r $(SOURCE_RULE)" $(TARGET_RULE)
sed -i '/English (US)/,/<variantList>/!b ; /<variantList>/r $(SOURCE_RULE)' $(TARGET_RULE)

uninstall: $(TARGET_SYM) $(TARGET_RULE)
sed -i '/^\/\/ENGRAM\/\/BEGIN$$/,/^\/\/ENGRAM\/\/END$$/d' $(TARGET_SYM)
sed -i '/^\/\/ENGRAM BEGIN$$/,/^\/\/ENGRAM END$$/d' $(TARGET_SYM)
sed -i '/ENGRAM BEGIN/,/ENGRAM END/d' $(TARGET_RULE)

reinstall:
Expand Down
6 changes: 4 additions & 2 deletions install/linux/x_keyboard_extension/usr-share-X11-xkb-symbols-us
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
//ENGRAM BEGIN
// Arno's Engram keyboard layout v2.0 - https://engram.dev
partial alphanumeric_keys
partial alphanumeric_keys modifier_keys
xkb_symbols "engram"
{
include "us(basic)"
name[Group1]="English (Engram)";

key <TLDE> { [ bracketleft, braceleft ] }; // [{
key <AE01> { [ 1, bar ] }; // 1|
Expand Down Expand Up @@ -55,3 +56,4 @@ xkb_symbols "engram"
key <AB09> { [ f, F ] }; // fF
key <AB10> { [ p, P ] }; // pP
};
//ENGRAM END