diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-19 14:47:22 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-05-19 14:47:22 +0200 |
commit | 042d94c4e91008067052d4f9601d4b76af80e2d1 (patch) | |
tree | 9e15e8b7f7ecc3aca3b70dbca3287a9157c36c8b /main/alpine-conf | |
parent | 957c515e9347dda1a578ec63007a5ebe729762cb (diff) | |
download | alpine_aports-042d94c4e91008067052d4f9601d4b76af80e2d1.tar.bz2 alpine_aports-042d94c4e91008067052d4f9601d4b76af80e2d1.tar.xz alpine_aports-042d94c4e91008067052d4f9601d4b76af80e2d1.zip |
main/alpine-conf: tiny setup-keymap enhancement
add useful feature for people who runs it often
Diffstat (limited to 'main/alpine-conf')
-rw-r--r-- | main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch | 36 | ||||
-rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 40 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch b/main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch new file mode 100644 index 0000000000..3214d0bc4f --- /dev/null +++ b/main/alpine-conf/0001-setup-keymap-allow-specify-the-variant-together-with.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From be87a08bc2200b80c068347568bea07a4fa09fb7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Fri, 19 May 2017 14:39:35 +0200 | ||
4 | Subject: [PATCH] setup-keymap: allow specify the variant together with layout | ||
5 | |||
6 | Some users may know exactly which variant they want, and instead of | ||
7 | asking them two questions, we accept if users types in the variant at | ||
8 | the first question. | ||
9 | |||
10 | if the variant does not exist, then user is prompted. | ||
11 | --- | ||
12 | setup-keymap.in | 8 +++++++- | ||
13 | 1 file changed, 7 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/setup-keymap.in b/setup-keymap.in | ||
16 | index 67f89cb..ebcd29c 100644 | ||
17 | --- a/setup-keymap.in | ||
18 | +++ b/setup-keymap.in | ||
19 | @@ -38,7 +38,13 @@ select_layout() { | ||
20 | default_read layout "$layout" | ||
21 | if [ "$layout" = "abort" ] || [ "$layout" = "none" ] ; then | ||
22 | goodbye 0 | ||
23 | - elif [ -d "$MAPDIR/$layout" ] ; then | ||
24 | + fi | ||
25 | + set -- $layout | ||
26 | + if [ $# -eq 2 ]; then | ||
27 | + layout="$1" | ||
28 | + variant="$2" | ||
29 | + fi | ||
30 | + if [ -d "$MAPDIR/$layout" ] ; then | ||
31 | return 0 | ||
32 | fi | ||
33 | done | ||
34 | -- | ||
35 | 2.13.0 | ||
36 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 8027b15875..619f95e2bb 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,13 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=3.6.0_rc1 | 3 | pkgver=3.6.0_rc1 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | arch="all" | 7 | arch="all" |
8 | license="MIT" | 8 | license="MIT" |
9 | depends="openrc>0.13 busybox>=1.26.1-r3" | 9 | depends="openrc>0.13 busybox>=1.26.1-r3" |
10 | source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz | 10 | source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz |
11 | 0001-setup-keymap-allow-specify-the-variant-together-with.patch | ||
11 | " | 12 | " |
12 | 13 | ||
13 | builddir="$srcdir"/$pkgname-$pkgver | 14 | builddir="$srcdir"/$pkgname-$pkgver |
@@ -24,4 +25,5 @@ package() { | |||
24 | done | 25 | done |
25 | } | 26 | } |
26 | 27 | ||
27 | sha512sums="3d1b7c18a406791948485cd871942b94a0f2eadd6f1f0e9c87f92fb15750b9b41ffec0d7d2d16361a1e25f029765005e72b266ce48609ea0b7c5e5c99606d04f alpine-conf-3.6.0_rc1.tar.xz" | 28 | sha512sums="3d1b7c18a406791948485cd871942b94a0f2eadd6f1f0e9c87f92fb15750b9b41ffec0d7d2d16361a1e25f029765005e72b266ce48609ea0b7c5e5c99606d04f alpine-conf-3.6.0_rc1.tar.xz |
29 | 67a1d72e45ba74d710a841c0a2671f74f792f6649fb530f86763fe2f10fc0005c644dfdcec25b00bc5eb0b97b2418775e95202269ef3b3f56b6c22044630fb86 0001-setup-keymap-allow-specify-the-variant-together-with.patch" | ||