Remove arch-install-scripts dependency and use manjaro-chroot. Do not install aif

merge-requests/273/head
Chrysostomus 7 years ago
parent 13ec7a5e1e
commit 3f6300c0e9

@ -1,14 +1,13 @@
# Maintainer: Chrysostomus @forum.manjaro.org
pkgname=manjaro-architect
pkgver=0.3
pkgver=0.4
pkgrel=1
pkgdesc="A clone of architect installer modified to install manjaro instead of arch linux"
arch=(any)
url="https://github.com/Manjaro-Pek/$pkgname"
url="https://github.com/Chrysostomus/aif-dev"
license=(GPL2)
depends=('pacman'
'arch-install-scripts'
'mhwd'
'manjaro-tools-base'
'dialog'
@ -19,7 +18,6 @@ source=("git://github.com/Chrysostomus/aif-dev")
md5sums=('SKIP')
package () {
cd "$srcdir/aif-dev"
install -Dm755 "$srcdir/aif-dev/aif" "$pkgdir/usr/bin/aif"
install -Dm755 "$srcdir/aif-dev/basestrappy" "$pkgdir/usr/bin/basestrappy"
install -Dm755 "$srcdir/aif-dev/manjaro-architect" "$pkgdir/usr/bin/manjaro-architect"
install -dm655 $pkgdir/usr/share/aif/package-lists

@ -238,7 +238,7 @@ id_system() {
# Adapted from AIS. An excellent bit of code!
arch_chroot() {
arch-chroot $MOUNTPOINT /bin/bash -c "${1}"
manjaro-chroot $MOUNTPOINT "${1}"
}
# If there is an error, display it, clear the log and then go back to the main menu (no point in continuing).

Loading…
Cancel
Save