From 075e8003fa9dfdd3b98e450e0252e110ea5dbd4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Mon, 10 Aug 2015 15:37:04 +0200
Subject: [PATCH] main/mksh: install mksh binary to /bin
fixes #4292
---
main/mksh/APKBUILD | 10 +++++-----
main/mksh/mksh.post-install | 2 +-
main/mksh/mksh.pre-deinstall | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/mksh/APKBUILD b/main/mksh/APKBUILD
index a1d7906de7ee..4902d2a0a19a 100644
--- a/main/mksh/APKBUILD
+++ b/main/mksh/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mksh
pkgver=51
_pkgver=R$pkgver
-pkgrel=0
+pkgrel=1
pkgdesc="MirBSD KSH Shell"
url="http://mirbsd.de/mksh"
arch="all"
@@ -10,7 +10,7 @@ license="BSD"
depends=""
depends_dev=""
makedepends=""
-install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-doc"
source="https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz"
@@ -22,9 +22,9 @@ build() {
package() {
cd "$_builddir"
- install -D -m 755 mksh "$pkgdir"/usr/bin/mksh
- install -D -m 644 mksh.1 "$pkgdir"/usr/share/man/man1/mksh.1
- install -D -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/dot.mkshrc
+ install -Dm755 mksh "$pkgdir"/bin/mksh
+ install -Dm644 mksh.1 "$pkgdir"/usr/share/man/man1/mksh.1
+ install -Dm644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/dot.mkshrc
}
md5sums="8e522475da795c60f35a6f8035481baf mksh-R51.tgz"
diff --git a/main/mksh/mksh.post-install b/main/mksh/mksh.post-install
index 77223923d7a9..5ba1f2fc63b6 100644
--- a/main/mksh/mksh.post-install
+++ b/main/mksh/mksh.post-install
@@ -1,3 +1,3 @@
#!/bin/sh
-add-shell '/usr/bin/mksh'
+add-shell '/bin/mksh'
exit 0
diff --git a/main/mksh/mksh.pre-deinstall b/main/mksh/mksh.pre-deinstall
index cc4e95411c38..82e6d3bfa0d4 100644
--- a/main/mksh/mksh.pre-deinstall
+++ b/main/mksh/mksh.pre-deinstall
@@ -1,3 +1,3 @@
#!/bin/sh
-remove-shell '/usr/bin/mksh'
+remove-shell '/bin/mksh'
exit 0
--
GitLab