merge devel in master

PKGBUILD

@@ -1,33 +0,0 @@
-# Maintainer: artoo <flower_of_life@gmx.net>
-
-pkgname=manjaro-tools-git
-pkgver=r161.6959de2
-pkgrel=1
-pkgdesc='Development tools for Manjaro Linux'
-arch=('any')
-license=('GPL')
-url='https://github.com/udeved/manjaro-tools'
-depends=('namcap' 'openssh' 'rsync'  'mkinitcpio-nfs-utils' 'nbd'
-	'libisoburn' 'squashfs-tools' 'syslinux' 'haveged')
-makedepends=('git')
-optdepends=('qemu: quickly test isos' 'manjaroiso-profiles: Manjaro Linux ISO-Image profiles')
-provides=('devtools' 'arch-install-scripts' 'manjaro-tools' 'manjaroiso')
-conflicts=('devtools' 'arch-install-scripts' 'manjaro-tools' 'manjaroiso')
-backup=('etc/manjaro-tools/manjaro-tools.conf')
-source=("git+$url.git")
-sha256sums=('SKIP')
-
-pkgver() {
-	cd ${srcdir}/manjaro-tools
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-build() {
-	cd ${srcdir}/manjaro-tools
-	make SYSCONFDIR=/etc PREFIX=/usr
-}
-
-package() {
-	cd ${srcdir}/manjaro-tools
-	make SYSCONFDIR=/etc PREFIX=/usr DESTDIR=${pkgdir} install
-}

bin/build-set.in

@@ -216,8 +216,6 @@ fi
 load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
-arch=$(uname -m)
-
 pacman_conf_arch='default'
 base_packages=('base-devel')
 

bin/buildiso.in

@@ -78,8 +78,6 @@ if [ -e Packages-Custom ] ; then
     pkgsfile="Packages-Custom"
 fi
 
-arch=$(uname -m)
-
 clean=false
 pretend=false
 high_compression=false

bin/chroot-run.in

@@ -101,9 +101,9 @@ build_mount_args() {
 umask 0022
 
 # Sanity check
-if [[ ! -f "$working_dir/.manjaro-chroot" ]]; then
+if [[ ! -f "$working_dir/.manjaro-tools" ]]; then
 	die "'%s' does not appear to be a Manjaro chroot." "$working_dir"
-elif [[ $(cat "$working_dir/.manjaro-chroot") != $version ]]; then
+elif [[ $(cat "$working_dir/.manjaro-tools") != $version ]]; then
 	die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$version"
 fi
 

bin/mkchroot.in

@@ -77,7 +77,7 @@ basestrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
 
 printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
 echo 'LANG=C' > "$working_dir/etc/locale.conf"
-echo "$version" > "$working_dir/.manjaro-chroot"
+echo "$version" > "$working_dir/.manjaro-tools"
 
 exec chroot-run \
 	${pac_conf:+-C "$pac_conf"} \

conf/manjaro-tools.conf

@@ -3,6 +3,9 @@
 # default branch
 # branch=stable
 
+# default arch
+# arch=$(uname -m)
+
 ########### manjaro-tools #############
 
 # path to sets

lib/util.sh

@@ -176,6 +176,12 @@ load_config(){
 	branch='stable'
     fi
     
+    if [[ -n ${arch} ]]; then
+	arch=${arch}
+    else
+	arch=$(uname -m)
+    fi
+    
     ###############
     # manjaro-tools
     ###############