Skip to content

Commit 59dbff1

Browse files
committed
Fixed AS-QMK’s install script.
1 parent 1dc2289 commit 59dbff1

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

qmk/arsenik-qmk.sh

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
!#/bin/sh
1+
#!/usr/bin/env bash
22

33
set -euo pipefail
44

@@ -17,6 +17,15 @@ if [ -z "${QMK_PATH+x}" ]; then
1717
fi
1818

1919

20+
if [ -z "${EDITOR+x}" ]; then
21+
if [ which nano 2>&1 >/dev/null ]; then
22+
EDITOR="nano"
23+
else
24+
EDITOR="vi"
25+
fi
26+
fi
27+
28+
2029
function get_keymaps_folder() {
2130
keyboard_name="$1"
2231
while [ ! -d "$QMK_PATH/keyboards/$keyboard_name/keymaps" ]; do
@@ -36,15 +45,18 @@ function make_new_arsenik_keymap() {
3645
local no_editor="$3"
3746

3847
local keymap_folder=$(get_keymaps_folder "$keyboard_name")
39-
local arsenik_folder="$keymap_folder/arsenik"
48+
local arsenik_folder="$keymap_folder/arsenik/"
4049
local default_keymap_folder="$keymap_folder/default"
4150

51+
echo "$default_keymap_folder"
52+
echo "$arsenik_folder"
4253
cp -r "$default_keymap_folder" "$arsenik_folder"
54+
ls -l "$arsenik_folder"
4355

4456
local layout=""
45-
case $(ls "$arsenik_folder"/keymap.* | sed 's/.*\(keymap.*\)/\1/') in
46-
"keymap.c") layout=$(grep 'LAYOUT' "$arsenik_folder"/keymap.c | sed 's/.*= \(.*\)(/\1/' | head -n 1);;
47-
"keymap.json") layout=$(grep 'LAYOUT' "$arsenik_folder"/keymap.json | sed 's/ *"layout": "\(.*\)",/\1/');;
57+
case $(ls "$default_keymap_folder"/keymap.* | sed 's/.*\(keymap.*\)/\1/') in
58+
"keymap.c") layout=$(grep 'LAYOUT' "$default_keymap_folder"/keymap.c | sed 's/.*= \(.*\)(/\1/' | head -n 1);;
59+
"keymap.json") layout=$(grep 'LAYOUT' "$default_keymap_folder"/keymap.json | sed 's/ *"layout": "\(.*\)",/\1/');;
4860
*) echo "Unable to find layout name, unsupported keymap format";;
4961
esac
5062

@@ -59,6 +71,7 @@ function make_new_arsenik_keymap() {
5971
cat ./rules.mk >> "$arsenik_folder/rules.mk"
6072
cp ./keymap.c ./arsenik.h ./keymap_ergol.h "$arsenik_folder"
6173

74+
# echo "s/ARSENIK_PLACEHOLDER_LAYOUT/$layout/"
6275
sed -i "s/ARSENIK_PLACEHOLDER_LAYOUT/$layout/" "$arsenik_folder/config.h"
6376

6477
if [ $no_editor = false ]; then

0 commit comments

Comments
 (0)