main/alpine-conf: use vi as default editor

fixes #496

2 files changed, 34 insertions, 3 deletions

diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index a32c86e434..ab17d1e55b 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,11 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=2.5.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+        editor.patch
+        "
+arch="noarch"
 license="GPL-2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -33,4 +36,5 @@ package() {
                 ln -s lbu "$pkgdir"/sbin/lbu_$i
         done
 }
-md5sums="91a2b8a150917cc06f6c9ec839b70bb0  alpine-conf-2.5.4.tar.bz2"
+md5sums="91a2b8a150917cc06f6c9ec839b70bb0  alpine-conf-2.5.4.tar.bz2
+c6f425ae21ff983f94b64eef8c236b22  editor.patch"
diff --git a/main/alpine-conf/editor.patch b/main/alpine-conf/editor.patch
new file mode 100644
index 0000000000..bec421e5fa
--- /dev/null
+++ b/main/alpine-conf/editor.patch
@@ -0,0 +1,27 @@
+commit ca0e10950a5db60121ac741f0bad28af9bb504b9
+Author: Natanael Copa <ncopa@alpinelinux.org>
+Date:   Tue Dec 28 13:27:55 2010 +0000
+
+    setup-interfaces: use vi as default editor
+    
+    since nano is not shipped with mini iso.
+
+diff --git a/setup-interfaces.in b/setup-interfaces.in
+index aad042d..b96ee58 100755
+--- a/setup-interfaces.in
++++ b/setup-interfaces.in
+@@ -141,12 +141,11 @@ while [ "$answer" != "yes" ] && [ "$answer" != "no" ] ; do
+ done
+ 
+ if [ "$answer" = "yes" ]; then
+-       [ -z "$EDITOR" ] && EDITOR=nano
+-       case $EDITOR in
++       case "$EDITOR" in
+                nano)   pkg_inst nano;;
+                vim)    pkg_inst vim;;
+        esac
+-       $EDITOR interfaces
++       ${EDITOR:-vi} interfaces
+ fi
+ 
+ mkdir -p $ROOT/etc/network