Merge pull request #62 from artix-linux/devel

deploypkg: simplify code in update_repo()

Makefile

@@ -1,4 +1,6 @@
-Version=0.5
+Version=0.7
+
+Chroot_version=0.7
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc
@@ -22,28 +24,19 @@ LIBS_BASE = \
 	lib/util-fstab.sh
 
 SHARED_BASE = \
-	data/pacman-default.conf \
+	$(wildcard data/pacman*.conf)
-	data/pacman-multilib.conf
-
-LIST_PKG = \
-	$(wildcard data/pkg.list.d/*.list)
-
-ARCH_CONF = \
-	$(wildcard data/make.conf.d/*.conf)
-
-LIST_IMPORT = \
-	$(wildcard data/import.list.d/*.list)
 
 BIN_PKG = \
 	bin/checkpkg \
 	bin/lddd \
 	bin/finddeps \
 	bin/find-libdeps \
-	bin/signpkgs \
 	bin/mkchrootpkg \
 	bin/buildpkg \
 	bin/buildtree \
-	bin/deploypkg
+	bin/deploypkg \
+	bin/commitpkg \
+	bin/mkpkgclean
 
 LIBS_PKG = \
 	$(wildcard lib/util-pkg*.sh)
@@ -51,6 +44,21 @@ LIBS_PKG = \
 SHARED_PKG = \
 	data/makepkg.conf
 
+PATCHES = \
+	$(wildcard data/patches/*.patch)
+
+COMMITPKG_SYMS = \
+	extrapkg \
+	corepkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
+	multilibpkg \
+	multilib-testingpkg \
+	multilib-stagingpkg
+
 BIN_ISO = \
 	bin/buildiso \
 	bin/deployiso
@@ -59,8 +67,7 @@ LIBS_ISO = \
 	$(wildcard lib/util-iso*.sh)
 
 SHARED_ISO = \
-	data/mkinitcpio.conf \
+	data/mkinitcpio.conf
-	data/profile.conf.example
 
 CPIOHOOKS = \
 	$(wildcard initcpio/hooks/*)
@@ -71,19 +78,6 @@ CPIOINST = \
 CPIO = \
 	initcpio/script/artix_shutdown
 
-BIN_YAML = \
-	bin/buildyaml
-
-LIBS_YAML = \
-	$(wildcard lib/util-yaml*.sh) \
-	lib/util-profile.sh
-
-SHARED_YAML = \
-	data/linux.preset
-
-INFO = \
-	data/repo_info
-
 BASE = \
 	$(wildcard data/base/Packages-*) \
 	data/base/profile.conf
@@ -101,12 +95,13 @@ LIVE_ETC_PAM = \
 LIVE_ETC_SUDOERS = \
 	$(wildcard data/base/live-overlay/etc/sudoers.d/*)
 
-all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) $(BIN_YAML)
+all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO)
 
 edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
 	-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
 	-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/artools|g" \
-	-e "s|@version@|${Version}|"
+	-e "s|@version@|${Version}|" \
+	-e "s|@chroot_version@|${Chroot_version}|"
 
 %: %.in Makefile
 	@echo "GEN $@"
@@ -132,30 +127,23 @@ install_base:
 	install -m0644 ${SHARED_BASE} $(DESTDIR)$(PREFIX)/share/artools
 
 install_pkg:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-	install -m0644 ${LIST_PKG} $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d
-
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
-	install -m0644 ${LIST_IMPORT} $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d
-
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d
-	install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d
-
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
 
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 
+	for l in ${COMMITPKG_SYMS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
+
 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
 	install -m0644 ${LIBS_PKG} $(DESTDIR)$(PREFIX)/lib/artools
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
 	install -m0644 ${SHARED_PKG} $(DESTDIR)$(PREFIX)/share/artools
 
-install_isobase:
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/patches
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
+	install -m0644 ${PATCHES} $(DESTDIR)$(PREFIX)/share/artools/patches
-	install -m0644 ${INFO} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles
 
+install_isobase:
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
 	install -m0644 ${BASE} $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base
 
@@ -175,6 +163,8 @@ install_iso:
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_ISO} $(DESTDIR)$(PREFIX)/bin
 
+	ln -sf buildiso $(DESTDIR)$(PREFIX)/bin/buildiso-gremlins
+
 	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
 	install -m0644 ${LIBS_ISO} $(DESTDIR)$(PREFIX)/lib/artools
 
@@ -186,20 +176,9 @@ install_iso:
 
 	install -m0755 ${CPIO} $(DESTDIR)$(SYSCONFDIR)/initcpio
 
-
 	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
 	install -m0644 ${SHARED_ISO} $(DESTDIR)$(PREFIX)/share/artools
 
-install_yaml:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -m0755 ${BIN_YAML} $(DESTDIR)$(PREFIX)/bin
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
-	install -m0644 ${LIBS_YAML} $(DESTDIR)$(PREFIX)/lib/artools
-
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
-	install -m0644 ${SHARED_YAML} $(DESTDIR)$(PREFIX)/share/artools
-
 uninstall_base:
 	for f in ${SYSCONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/$$f; done
 	for f in ${BIN_BASE}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
@@ -207,16 +186,14 @@ uninstall_base:
 	for f in ${LIBS_BASE}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
 uninstall_pkg:
-	for f in ${LIST_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/pkg.list.d/$$f; done
-	for f in ${LIST_IMPORT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/import.list.d/$$f; done
-	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/artools/make.conf.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
+	for l in ${COMMITPKG_SYMS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
+	for f in ${PATCHES}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/patches/$$f; done
 	for f in ${LIBS_PKG}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
 
 uninstall_isobase:
-	for f in ${INFO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/$$f; done
 	for f in ${BASE}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/$$f; done
 	for f in ${LIVE_ETC}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/$$f; done
 	for f in ${LIVE_ETC_DEFAULT}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/iso-profiles/base/live-overlay/etc/default/$$f; done
@@ -225,6 +202,7 @@ uninstall_isobase:
 
 uninstall_iso:
 	for f in ${BIN_ISO}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+	rm -f $(DESTDIR)$(PREFIX)/bin/buildiso-gremlins
 	for f in ${SHARED_ISO}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
 
 	for f in ${LIBS_ISO}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
@@ -232,14 +210,9 @@ uninstall_iso:
 	for f in ${CPIOINST}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/install/$$f; done
 	for f in ${CPIO}; do rm -f $(DESTDIR)$(SYSCONFDIR)/initcpio/$$f; done
 
-uninstall_yaml:
+install: install_base install_pkg install_iso install_isobase
-	for f in ${BIN_YAML}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in ${LIBS_YAML}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
-	for f in ${SHARED_YAML}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
 
-install: install_base install_pkg install_iso install_yaml install_isobase
+uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_isobase
-
-uninstall: uninstall_base uninstall_pkg uninstall_iso uninstall_yaml uninstall_isobase
 
 dist:
 	git archive --format=tar --prefix=artools-$(Version)/ $(Version) | gzip -9 > artools-$(Version).tar.gz

README.md

@@ -31,16 +31,12 @@ By default it is commented and shows just initialization values done in code.
 Tools configuration is done in artools.conf or by args.
 Specifying args will override artools.conf settings.
 
-User build lists(eg 'my-super-build.list') can be placed in
-
 ~~~
-$HOME/.config/artools/pkg.list.d
+$HOME/.config/artools/import.list.d
-$HOME/.config/artools/iso.list.d
 ~~~
 
 overriding
 
 ~~~
-/etc/artools/pkg.list.d
+/etc/artools/import.list.d
-/etc/artools/iso.list.d
 ~~~

bin/basestrap.in

@@ -25,12 +25,13 @@ newroot=/mnt
 hostcache=false
 copykeyring=true
 copymirrorlist=true
+directory=false
+interactive=false
 
 usage() {
     echo "usage: ${0##*/} [options] root [packages...]"
     echo " -C <config>      Use an alternate config file for pacman"
     echo " -c               Use the package cache on the host, rather than the target"
-    echo " -d               Allow installation to a non-mountpoint directory"
     echo " -G               Avoid copying the host's pacman keyring to the target"
     echo " -i               Avoid auto-confirmation of package selections"
     echo " -M               Avoid copying the host's mirrorlist to the target"
@@ -45,12 +46,11 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts=':C:cdGiM'
+opts=':C:cGiM'
 
 while getopts ${opts} arg; do
     case "${arg}" in
         C) pacman_conf=$OPTARG ;;
-        d) directory=true ;;
         c) hostcache=true ;;
         i) interactive=true ;;
         G) copykeyring=false ;;
@@ -67,18 +67,14 @@ check_root
 newroot=$1; shift
 pacman_args=("${@:-base}")
 
-${hostcache} && pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
+${hostcache} || pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
 
-${interactive} && pacman_args+=(--noconfirm)
+${interactive} || pacman_args+=(--noconfirm)
 
 [[ -n $pacman_conf ]] && pacman_args+=(--config="$pacman_conf")
 
 [[ -d $newroot ]] || die "%s is not a directory" "$newroot"
 
-if ! mountpoint -q "$newroot" && ! ${directory}; then
-    die '%s is not a mountpoint!' "$newroot"
-fi
-
 # create obligatory directories
 create_min_fs "$newroot"
 

bin/buildiso.in

@@ -19,24 +19,50 @@ SYSCONFDIR='@sysconfdir@'
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-iso.sh
 
+prepare_build(){
+    timer_start=$(get_timer)
+
+    load_profile "${profile}"
+
+    netgroups=${netgroups_url}/netgroups-${initsys}.yaml
+
+    local pacman_conf pac_file="pacman-default.conf"
+
+    case "${stablility}" in
+        'gremlins') pac_file="pacman-${stablility}.conf" ;;
+    esac
+
+    pacman_conf="${DATADIR}/$pac_file"
+    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
+
+    iso_file=$(gen_iso_fn).iso
+
+    mkchroot_args+=(-C ${pacman_conf})
+    work_dir=${chroots_iso}/${profile}/${target_arch}
+
+    iso_dir="${iso_pool}/${profile}"
+
+    iso_root=${chroots_iso}/${profile}/iso
+    mnt_dir=${chroots_iso}/${profile}/mnt
+    prepare_dir "${mnt_dir}"
+    prepare_dir "${iso_dir}"
+}
+
 show_profile(){
-    prepare_build
     msg2 "iso_file: %s" "${iso_file}"
     if ${verbose};then
         msg2 "autologin: %s" "${autologin}"
 
-        msg2 "netgroups: %s" "$(get_yaml)"
+        msg2 "netgroups: %s" "${netgroups}"
 
         msg2 "hostname: %s" "${hostname}"
         msg2 "username: %s" "${username}"
         msg2 "password: %s" "${password}"
         msg2 "addgroups: %s" "${addgroups}"
 
-        msg2 "enable_live: %s" "${enable_live[*]}"
+        msg2 "services_live: %s" "${services_live[*]}"
-        msg2 "openrc_boot: %s" "${openrc_boot[*]}"
+        msg2 "services: %s" "${services[*]}"
-        msg2 "openrc_default: %s" "${openrc_default[*]}"
     fi
-    reset_profile
 }
 
 display_settings(){
@@ -45,10 +71,10 @@ display_settings(){
 
     msg "OPTIONS:"
     msg2 "profile: %s" "${profile}"
-    msg2 "arch: %s" "${target_arch}"
     msg2 "initsys: %s" "${initsys}"
     msg2 "kernel: %s" "${kernel}"
     [[ -n ${gpgkey} ]] && msg2 "gpgkey: %s" "${gpgkey}"
+    msg2 "stablility: %s" "${stablility}"
 
     msg "ARGS:"
     msg2 "clean_first: %s" "${clean_first}"
@@ -56,21 +82,52 @@ display_settings(){
     msg2 "iso_only: %s" "${iso_only}"
     msg2 "persist: %s" "${persist}"
 
-    msg "DIST SETTINGS:"
+    msg "ISO SETTINGS:"
-    msg2 "dist_name: %s" "${dist_name}"
+    msg2 "iso_version: %s" "${iso_version}"
-    msg2 "dist_release: %s" "${dist_release}"
-    msg2 "dist_branding: %s" "${dist_branding}"
 
     msg "BUILD:"
     show_profile
 }
 
+build(){
+    msg "Start building [%s]" "${profile}"
+    if ${clean_first};then
+        for copy in "${work_dir}"/*; do
+            [[ -d $copy ]] || continue
+            msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
+
+            lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
+
+            subvolume_delete_recursive "${copy}"
+            rm -rf --one-file-system "${copy}"
+        done
+        lock_close 9
+
+        rm -rf --one-file-system "${work_dir}"
+        clean_iso_root "${iso_root}"
+    fi
+
+    if ${iso_only}; then
+        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
+        compress_images
+        exit 1
+    fi
+    if ${images_only}; then
+        prepare_images
+        warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
+        exit 1
+    else
+        prepare_images
+        compress_images
+    fi
+    msg "Finished building [%s]" "${profile}"
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
+}
+
 load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
 
-load_run_dir
-
 clean_first=true
 pretend=false
 images_only=false
@@ -79,15 +136,16 @@ verbose=false
 persist=false
 
 mkchroot_args=()
+cmd=${0##*/}
+stablility=${cmd##*-}
 
 usage() {
     echo "Usage: ${0##*/} [options]"
     echo "    -p <profile>       Profile [default: ${profile}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
     echo '    -r <dir>           Chroots directory'
     echo "                       [default: ${chroots_iso}]"
     echo '    -t <dir>           Target directory'
-    echo "                       [default: ${cache_dir_iso}]"
+    echo "                       [default: ${iso_pool}]"
     echo '    -k <name>          Kernel to use'
     echo "                       [default: ${kernel}]"
     echo '    -i <name>          Init system to use'
@@ -109,14 +167,13 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:t:k:i:g:czxmvqh'
+opts='p:r:t:k:i:g:czxmvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) profile="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
         r) chroots_iso="$OPTARG" ;;
-        t) cache_dir_iso="$OPTARG" ;;
+        t) iso_pool="$OPTARG" ;;
         k) kernel="$OPTARG" ;;
         i) initsys="$OPTARG" ;;
         g) gpgkey="$OPTARG" ;;
@@ -135,7 +192,9 @@ shift $(($OPTIND - 1))
 
 check_root
 
-check_requirements
+prepare_traps
+
+prepare_build
 
 ${pretend} && display_settings && exit 1
 

bin/buildpkg.in

@@ -20,17 +20,12 @@ SYSCONFDIR='@sysconfdir@'
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-chroot.sh
-import ${LIBDIR}/util-pkg.sh
-import ${LIBDIR}/util-pkg-chroot.sh
 
 show_pkg(){
-    check_build "$1"
+    source PKGBUILD
-    cd $1
+    for n in ${pkgname[@]}; do
-        source PKGBUILD
+        msg2 "%s" "$n"
-        for n in ${pkgname[@]}; do
+    done
-            msg2 "%s" "$n"
-        done
-    cd ..
 }
 
 display_settings(){
@@ -38,139 +33,89 @@ display_settings(){
     show_config
 
     msg "OPTIONS:"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "repository: %s" "${repository}"
     msg2 "chroots_pkg: %s" "${chroots_pkg}"
+    msg2 "repository: %s" "${repository}"
 
     msg "ARGS:"
     msg2 "create_first: %s" "${create_first}"
-    msg2 "delete_first: %s" "${delete_first}"
+    msg2 "makepkg_args: %s" "${makepkg_args[*]}"
-    msg2 "clean_first: %s" "${clean_first}"
+    msg2 "mkchrootpkg_args: %s" "${mkchrootpkg_args[*]}"
-    msg2 "update_first: %s" "${update_first}"
+    
-    msg2 "namcap: %s" "${namcap}"
-    msg2 "sign: %s" "${sign}"
-    msg2 "repo_add: %s" "${repo_add}"
-    msg2 "copy_pkg: %s" "${copy_pkg}"
-
-    msg "PATHS:"
-    msg2 "pkg_dir: %s" "${pkg_dir}"
-
-    if ${create_first};then
-        msg "PKG:"
-        msg2 "packages: %s" "${packages[*]}"
-    fi
-
     msg "BUILD:"
-    show_pkg "${package}"
+    show_pkg
 }
 
 load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
-load_vars /etc/makepkg.conf
 
 create_first=false
-delete_first=false
-clean_first=false
-update_first=false
-namcap=false
 pretend=false
-sign=false
-is_multilib=false
-repo_add=false
-copy_pkg=false
 
 mkchroot_args=()
-mkchrootpkg_args=()
+mkchrootpkg_args=(-c -n)
-deploypkg_args=(-x)
-
-install_pkgs=()
-repository=${PWD##*/}
-package=''
 
+repository='default'
+    
 prepare_build(){
-    local pac_arch='default'
+    local pac_file= mp_file='makepkg.conf'    
+            
+    base_devel=('base-devel')
+    
+    case ${repository} in
+        'system'|'world'|'galaxy') repository='default' ;;
+        lib32*) base_devel+=('multilib-devel') ;;
+        galaxy-gremlins|galaxy-goblins) repository=${repository#*-} ;;
+    esac
+    local pac_file="pacman-${repository}.conf"
 
-    if [[ "${target_arch}" == 'multilib' ]];then
+    local pacman_conf="${DATADIR}/$pac_file"
-        pac_arch='multilib'
+    [[ -f $AT_USERCONFDIR/$pac_file ]] && pacman_conf="$AT_USERCONFDIR/$pac_file"
-        is_multilib=true
-    fi
 
-    local pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
+    work_dir="${chroots_pkg}/${repository}-${target_arch}"
-    [[ -f $AT_USERCONFDIR/pacman-$pac_arch.conf ]] && pacman_conf="$AT_USERCONFDIR/pacman-$pac_arch.conf"
 
-    work_dir="${chroots_pkg}/${target_arch}/${repository}"
+    local makepkg_conf="${DATADIR}/$mp_file"
-    pkg_dir="${cache_dir_pkg}/${target_arch}/${repository}"
+    [[ -f $AT_USERCONFDIR/$mp_file ]] && makepkg_conf="$AT_USERCONFDIR/$mp_file"
 
-    local makepkg_conf=$(get_makepkg_conf "${target_arch}")
+    mkchroot_args+=(-C "${pacman_conf}" -M "${makepkg_conf}" "${work_dir}/root")
 
-    [[ "$pac_arch" == 'multilib' ]] && target_arch='x86_64'
+    mkchrootpkg_args+=(-r "${work_dir}" "${makepkg_args[@]}")
+}
 
-    mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf})
+build(){
+    local timer_start=$(get_timer) 
 
-    mkchrootpkg_args+=(-r ${work_dir})
+    exec mkchrootpkg "${mkchrootpkg_args[@]}"
-    deploypkg_args+=(-r ${repository})
+    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-
-    prepare_dir "${pkg_dir}"
-
-    prepare_dir "${work_dir}"
-
-    packages=('base-devel')
-    ${is_multilib} && packages+=('multilib-devel')
-
-    timer_start=$(get_timer)
 }
 
 usage() {
-    echo "Usage: ${0##*/} [options]"
+    echo "Usage: ${0##*/} [options] -- [makepkg_args]"
-    echo "    -p <pkg>           Package to build [default: ${package}]"
+    echo "    -r <dir>           Repository [default: ${repository}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
+    echo '    -c                 Create root chroot'
-    echo '    -r <dir>           Chroots directory'
-    echo "                       [default: ${chroots_pkg}]"
-    echo '    -i <pkgs>          Install packages into the working copy of the chroot'
-    echo "    -z <repo>          The repo name to add the package(s) [default: ${repository}]"
-    echo '    -o                 Create chroot'
-    echo '    -d                 Delete chroot'
-    echo '    -c                 Clean chroot copy'
-    echo '    -u                 Update chroot copy'
-    echo '    -x                 Add the package(s) to the repo'
-    echo '    -l                 Copy the package(s) to the repo instead of symlink'
-    echo '    -n                 Install and run namcap check'
-    echo '    -s                 Sign packages'
     echo '    -q                 Query settings and pretend build'
     echo '    -h                 This help'
     echo ''
+    echo "Default makepkg_args args: ${makepkg_args[*]}"
     echo ''
     exit $1
 }
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:i:z:oldcunsxqh'
+opts='r:cqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        p) package="$OPTARG" ;;
+        r) repository="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
+        c) create_first=true ;;
-        r) chroots_pkg="$OPTARG" ;;
-        i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I "${install_pkgs[*]}") ;;
-        z) repository="$OPTARG" ;;
-        o) create_first=true ;;
-        d) delete_first=true ;;
-        c) clean_first=true ; mkchrootpkg_args+=(-c) ;;
-        u) update_first=true ; mkchrootpkg_args+=(-u) ;;
-        x) repo_add=true ;;
-        l) copy_pkg=true; deploypkg_args+=(-c) ;;
-        n) namcap=true; mkchrootpkg_args+=(-n) ;;
-        s) sign=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '%s'" "${arg}"; usage 1 ;;
     esac
 done
 
-shift $(($OPTIND - 1))
+makepkg_args+=("${@:$OPTIND}")
 
 check_root
 
@@ -178,8 +123,28 @@ prepare_build
 
 ${pretend} && display_settings && exit
 
-${delete_first} && delete_chroot "${work_dir}/root" "${work_dir}"
+if ${create_first} || [[ ! -d ${work_dir}/root ]];then
+    msg "Creating chroot for [%s] (%s)..." "${repository}" "${target_arch}"
 
-${create_first} && create_chroot "${mkchroot_args[@]}" "${work_dir}/root" "${packages[@]}"
+    for copy in "${work_dir}"/*; do
+        [[ -d $copy ]] || continue
+        msg2 "Deleting chroot copy '%s'..." "$(basename "${copy}")"
 
-build "${package}"
+        lock 9 "$copy.lock" "Locking chroot copy '%s'" "$copy"
+
+        subvolume_delete_recursive "${copy}"
+        rm -rf --one-file-system "${copy}"
+    done
+    lock_close 9
+
+    rm -rf --one-file-system "${work_dir}"
+    mkdir -p "${work_dir}"
+    setarch "${target_arch}" mkchroot \
+        "${mkchroot_args[@]}"  "${base_devel[@]}" || abort
+else
+    lock 9 "${work_dir}/root.lock" "Locking clean chroot"
+    chroot-run "${mkchroot_args[@]}" \
+        pacman -Syu --noconfirm || abort
+fi
+
+build

bin/buildtree.in

@@ -13,64 +13,231 @@ version=@version@
 
 LIBDIR='@libdir@'
 SYSCONFDIR='@sysconfdir@'
+DATADIR='@datadir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg-tree.sh
+import ${LIBDIR}/util-pkg.sh
 
-show_imports(){
+pull_tree_arch(){
-    for repo in ${repo_tree_import[@]};do
+    cd ${tree_dir_arch}
-        read_import_list "$repo"
+    for tree in packages community;do
-        for p in ${import_list[@]};do
+        if [[ -d ${tree} ]];then
-            msg2 "%s: %s" ""$repo "$p"
+            cd ${tree}
+                msg "Checking (%s)" "${tree}"
+                pull_tree
+            cd ..
+        else
+            msg "Cloning (%s) ..." "$tree"
+            clone_tree "${host_tree_arch}/${tree}"
+        fi
+    done
+}
+
+pull_tree_artix(){
+    cd ${tree_dir_artix}
+    for tree in packages packages-galaxy;do
+        if [[ -d ${tree} ]];then
+            cd ${tree}
+                git config --bool pull.rebase true
+                msg "Checking (%s)" "${tree}"
+                pull_tree
+            cd ..
+        else
+            msg "Cloning (%s) ..." "$tree"
+            clone_tree "${host_tree_artix}/${tree}"
+        fi
+    done
+}
+
+show_version_table(){
+    msg_table_header "%-20s %-20s %-25s %-30s %-30s" "Arch Repo" "Artix Repo" "Package" "Arch version" "Artix version"
+    for tree in packages packages-galaxy;do
+        local git=$(find ${tree_dir_artix}/$tree/ -mindepth 1 -maxdepth 1 -type d)
+        for pkg_path in ${git[@]}; do
+            local artixrepo=$(find_repo "$pkg_path" "${unstable}")
+            if [[ -d $pkg_path/repos/$artixrepo ]];then
+                source $pkg_path/repos/$artixrepo/PKGBUILD 2>/dev/null
+                local pkg=${pkg_path##*/}
+                local artixver=$(get_full_version $pkg)
+                local src=$(get_import_path "$tree" "$pkg")
+                local archrepo=$(find_repo "$src/$pkg" "${unstable}")
+                if [[ -d $src/$pkg/repos/$archrepo ]];then
+                    source $src/$pkg/repos/$archrepo/PKGBUILD 2>/dev/null
+                    local archver=$(get_full_version $pkg)
+                fi
+                if ${artix};then
+                    if [ $(vercmp $artixver $archver) -eq 0 ] || [ $(vercmp $artixver $archver) -gt 0 ];then
+                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        case $ar in
+                            *goblins)
+                                if [[ $archrepo == $artixrepo ]];then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                            *gremlins)
+                                if [[ $archrepo == $artixrepo ]];then
+                                    msg_row "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                else
+                                    msg_row_notify "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                                fi
+                            ;;
+                        esac
+                    fi
+                else
+                    if [ $(vercmp $artixver $archver) -lt 0 ];then
+                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        ${upgrades} && msg_row_upgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                    fi
+                    if [ $(vercmp $artixver $archver) -gt 0 ];then
+                        local ar=$(arch_to_artix_repo "$artixrepo")
+                        if [[ -n $archver ]] && [[ -n $archrepo ]];then
+                            ${downgrades} && msg_row_downgrade "%-20s %-20s %-25s %-30s %-30s" "${archrepo%-*}" "${ar}" "$pkg" "$archver" "$artixver"
+                        fi
+                    fi
+                fi
+                unset pkgver epoch pkgrel artixver archver _package
+            fi
         done
     done
 }
 
+show_deps(){
+    local src="$1" repo="$2"
+    source $src/PKGBUILD 2>/dev/null
+    [[ $arch == 'any' ]] && CARCH=any
+    local archver=$(get_full_version $pkg)
+    msg "git tree: %s" "$git_tree_arch"
+    msg2 "repo: %s" "$repo"
+    msg2 "Package Name: %s" "$pkg"
+    msg2 "Arch Version: %s" "$archver"
+    msg2 "arch: %s" "$CARCH"
+    [[ -n ${makedepends[@]} ]] && msg2 "makedepends: %s" "${makedepends[*]}"
+    [[ -n ${checkdepends[@]} ]] && msg2 "checkdepends: %s" "${checkdepends[*]}"
+    [[ -n ${depends[@]} ]] && msg2 "depends: %s" "${depends[*]}"
+    [[ -n ${optdepends[@]} ]] && msg2 "optdepends: %s" "${optdepends[@]}"
+}
+
+from_arch(){
+    local pkg="$1" src= dest=
+    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+
+    local pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$pkg_path" "${unstable}")
+
+    src=$pkg_path/repos/$repo
+    $trunk && src=$pkg_path/trunk
+
+    local git_tree_artix=$(find_tree "${tree_dir_artix}" "$pkg")
+    dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
+
+    cd ${tree_dir_arch}/$git_tree_arch
+
+    show_deps "$src" "$repo"
+
+    if [[ -d $dest ]];then
+        cd ${tree_dir_artix}/$git_tree_artix
+
+        source $dest/PKGBUILD 2>/dev/null
+        local artixver=$(get_full_version $pkg)
+
+        msg2 "Artix Version: %s" "$artixver"
+        info "Update from archlinux (%s)" "$git_tree_arch"
+        rsync "${rsync_args[@]}" $src/ $dest/
+        patch_pkg "$pkg" "$tree"
+    else
+        [[ $git_tree_arch == 'packages' ]] && git_tree_artix=$git_tree_arch
+        [[ $git_tree_arch == 'community' ]] && git_tree_artix='packages-galaxy'
+
+        cd ${tree_dir_artix}/$git_tree_artix
+
+        dest=${tree_dir_artix}/$git_tree_artix/$pkg/trunk
+        mkdir $pkg
+
+        info "Import from archlinux (%s)" "$git_tree_arch"
+        rsync "${rsync_args[@]}" $src/ $dest/
+        patch_pkg "$pkg" "$tree"
+    fi
+}
+
+view_build(){
+    local pkg="$1" src=
+    local git_tree_arch=$(find_tree "${tree_dir_arch}" "$pkg")
+    [[ -z $git_tree_arch ]] && die "Package '%s' does not exist!" "$pkg"
+
+    local pkg_path=${tree_dir_arch}/$git_tree_arch/$pkg
+    local repo=$(find_repo "$pkg_path" "${unstable}")
+
+    src=$pkg_path/repos/$repo
+
+    show_deps "$src" "$repo"
+}
+
+sync_repos(){
+    ${sync_arch} && pull_tree_arch
+    pull_tree_artix
+}
+
 display_settings(){
     show_version
     show_config
 
-    msg "REPOS:"
+    msg "OPTIONS:"
-    msg2 "repo_tree_arch: %s" "${repo_tree_arch[*]}"
+    msg2 "package: %s" "${package}"
-    msg2 "repo_tree_import: %s" "${repo_tree_import[*]}"
 
     msg "ARGS:"
-    msg2 "verbose: %s" "${verbose}"
+    msg2 "sync: %s" "${sync}"
+    msg2 "sync_arch: %s" "${sync_arch}"
+    msg2 "compare: %s" "${compare}"
+    msg2 "upgrades: %s" "${upgrades}"
+    msg2 "downgrades: %s" "${downgrades}"
     msg2 "artix: %s" "${artix}"
-    msg2 "arch: %s" "${arch}"
+    msg2 "import: %s" "${import}"
-    msg2 "import_arch: %s" "${import_arch}"
+    msg2 "view: %s" "${view}"
+    msg2 "trunk: %s" "${trunk}"
 
     msg "PATHS:"
     msg2 "tree_dir_artix: %s" "${tree_dir_artix}"
     msg2 "tree_dir_arch: %s" "${tree_dir_arch}"
-
-    if ${verbose}; then
-        if ${import_arch};then
-            msg "IMPORT QUEUE:"
-            show_imports
-        fi
-    fi
 }
 
 load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
 
-artix=false
 pretend=false
-arch=false
+sync=false
-import_arch=false
+sync_arch=true
-verbose=false
+compare=false
+unstable=false
+upgrades=false
+downgrades=false
+artix=false
+import=false
+view=false
+trunk=false
+package=''
 
-rsync_args=(-aWx --progress --delete --no-R --no-implied-dirs)
+rsync_args=(-aWxvci --progress --delete-before --no-R --no-implied-dirs)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -x            Sync artix import tree"
+    echo '    -p <pkg>      Package name'
-    echo "    -a            Sync arch tree"
+    echo "    -s            Clone or pull repos"
-    echo '    -i            Import arch packages'
+    echo "    -z            Don't clone or pull arch repos"
-    echo '    -v            Verbose import output'
+    echo '    -c            Compare packages'
+    echo '    -x            Include unstable kde and gnome'
+    echo '    -u            Show upgrade packages'
+    echo '    -d            Show downgrade packages'
+    echo '    -a            Show testing and staging packages'
+    echo '    -i            Import a package from arch repos'
+    echo '    -t            Import from arch trunk'
+    echo '    -v            View package depends'
     echo '    -q            Query settings'
     echo '    -h            This help'
     echo ''
@@ -80,14 +247,21 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='xaivqh'
+opts='p:csudaiztxvqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        x) artix=true ;;
+        p) package="$OPTARG" ;;
-        a) arch=true ;;
+        s) sync=true ;;
-        i) import_arch=true ;;
+        z) sync_arch=false ;;
-        v) verbose=true; rsync_args+=(-v --stats) ;;
+        c) compare=true ;;
+        u) upgrades=true ;;
+        d) downgrades=true ;;
+        a) artix=true ;;
+        i) import=true ;;
+        t) trunk=true ;;
+        v) view=true ;;
+        x) unstable=true ;;
         q) pretend=true ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
@@ -101,8 +275,10 @@ prepare_dir "${tree_dir_arch}"
 
 ${pretend} && display_settings && exit 1
 
-${artix} && sync_tree_artix
+${sync} && sync_repos
 
-${arch} && sync_tree_arch
+${view} && view_build "${package}"
 
-${import_arch} && import_from_arch
+${compare} && show_version_table
+
+${import} && from_arch "${package}"

bin/buildyaml.in

@@ -1,114 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-version=@version@
-
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-
-[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-yaml-check.sh
-import ${LIBDIR}/util-profile.sh
-
-show_profile(){
-    prepare_build
-    msg2 "yaml_dir: %s" "${yaml_dir}"
-    msg2 "autologin: %s" "${autologin}"
-
-    msg2 "netgroups: %s" "$(get_yaml)"
-
-    msg2 "hostname: %s" "${hostname}"
-    msg2 "username: %s" "${username}"
-    msg2 "password: %s" "${password}"
-    msg2 "addgroups: %s" "${addgroups}"
-
-    msg2 "enable_live: %s" "${enable_live[*]}"
-    msg2 "openrc_boot: %s" "${openrc_boot[*]}"
-    msg2 "openrc_default: %s" "${openrc_default[*]}"
-
-    reset_profile
-    unset yaml_dir
-}
-
-display_settings(){
-    show_version
-    show_config
-
-    msg "OPTIONS:"
-    msg2 "profile: %s" "${profile}"
-    msg2 "arch: %s" "${target_arch}"
-    msg2 "initsys: %s" "${initsys}"
-    msg2 "kernel: %s" "${kernel}"
-
-    msg "ARGS:"
-    msg2 "calamares: %s" "${calamares}"
-    msg2 "group: %s" "${group}"
-
-    msg "BUILD:"
-    show_profile
-}
-
-load_user_info
-
-load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
-
-# to force old way to have buildiso run in iso-profiles dir
-# run_dir=$(pwd)
-
-load_run_dir
-
-calamares=false
-pretend=false
-group=false
-cache_dir_netinstall="${workspace_dir}/netinstall"
-
-usage() {
-    echo "Usage: ${0##*/} [options]"
-    echo "    -p <profile>       Buildset or profile [default: ${profile}]"
-    echo "    -a <arch>          Arch [default: ${target_arch}]"
-    echo "    -k <name>          Kernel to use[default: ${kernel}]"
-    echo "    -i <name>          Init system to use [default: ${initsys}]"
-    echo '    -c                 Check also calamares yaml files generated for the profile'
-    echo '    -g                 Enable pacman group accepted for -p'
-    echo '    -q                 Query settings'
-    echo '    -h                 This help'
-    echo ''
-    echo ''
-    exit $1
-}
-
-orig_argv=("$0" "$@")
-
-opts='p:a:i:k:gcqh'
-
-while getopts "${opts}" arg; do
-    case "${arg}" in
-        p) profile="$OPTARG" ;;
-        a) target_arch="$OPTARG" ;;
-        i) initsys="$OPTARG" ;;
-        k) kernel="$OPTARG" ;;
-        c) calamares=true ;;
-        g) group=true ;;
-        q) pretend=true ;;
-        h|?) usage 0 ;;
-        *) echo "invalid argument '${arg}'"; usage 1 ;;
-    esac
-done
-
-shift $(($OPTIND - 1))
-
-${pretend} && display_settings && exit 1
-
-${group} && write_pacman_group_yaml "${profile}" && exit 0
-
-build

bin/checkpkg.in

@@ -14,6 +14,7 @@ version=@version@
 LIBDIR='@libdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
 import ${LIBDIR}/util-pkg.sh
 
 shopt -s extglob

bin/chroot-run.in

@@ -11,10 +11,13 @@
 
 version=@version@
 
+chroot_version=@chroot_version@
+
 LIBDIR='@libdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-chroot.sh
 import ${LIBDIR}/util-mount.sh
 
 working_dir=''
@@ -86,11 +89,13 @@ copy_hostconf () {
         cp -T "$file" "$working_dir$file"
     done
 
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$1/etc/pacman.conf"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$1/etc/pacman.conf"
 }
 
 chroot_extra_mount() {
     chroot_mount "/etc/resolv.conf" "$1/etc/resolv.conf" -B
+    chroot_mount "/etc/hosts" "$1/etc/hosts" -B
+    chroot_mount_conditional "[[ -e $1/etc/machine-id ]]" "/etc/machine-id" "$1/etc/machine-id" -B
     chroot_mount "${cache_dirs[0]}" "$1${cache_dirs[0]}" -B
 
     for cache_dir in ${cache_dirs[@]:1}; do
@@ -111,8 +116,8 @@ umask 0022
 # Sanity check
 if [[ ! -f "$working_dir/.artools" ]]; then
     die "'%s' does not appear to be an artix chroot." "$working_dir"
-elif [[ $(cat "$working_dir/.artools") != $version ]]; then
+elif [[ $(cat "$working_dir/.artools") != $chroot_version ]]; then
-    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$version"
+    die "chroot '%s' is not at version %s. Please rebuild." "$working_dir" "$chroot_version"
 fi
 
 chroot_api_mount "${working_dir}" || die "failed to setup API filesystems in chroot %s" "${working_dir}"
@@ -126,3 +131,9 @@ eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
 ${nosetarch} && unset CARCH
 
 ${CARCH:+setarch "$CARCH"} chroot "${working_dir}" "$@"
+
+ret=$?
+
+kill_chroot_process "${working_dir}"
+
+exit $ret

bin/commitpkg.in

@@ -0,0 +1,173 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+DATADIR='@datadir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+import ${LIBDIR}/util-pkg.sh
+
+commit_pkg(){
+    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
+    if [[ -n ${git_tree} ]];then
+        cd ${tree_dir_artix}/${git_tree}/${package}
+
+        source trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${package}")
+
+        if ${remove};then
+            local action='remove'
+            if [[ "${source_repo}" == 'trunk' ]];then
+                local pkg=${package}
+                git rm -r trunk
+            else
+                local pkg="${package}-$ver"
+                git rm -r repos/"${source_repo}-$CARCH"
+            fi
+            msg "Action: [%s] '%s' %s" "${source_repo}" "$pkg" "${action}"
+            git commit -m "[${source_repo}] '$pkg' ${action}"
+        else
+            local action='modify'
+            msg "Action: [%s] '%s' %s" "${source_repo}" "${package}-$ver" "${action}"
+            git add .
+            git commit -m "[${source_repo}] '${package}-$ver' ${action}"
+        fi
+
+        if ${push};then
+            msg "Checking (%s)" "${git_tree}"
+            git pull origin master
+            git push origin master
+        fi
+    else
+        error "Package '%s' does not exist!" "${package}"
+    fi
+}
+
+symlink_commit_pkg(){
+    local git_tree=$(find_tree "${tree_dir_artix}" "${package}")
+    if [[ -n ${git_tree} ]];then
+        cd ${tree_dir_artix}/${git_tree}/${package}
+
+        source trunk/PKGBUILD
+        [[ $arch == 'any' ]] && CARCH=any
+        local ver=$(get_full_version "${package}")
+
+        if [[ ${source_repo} == 'trunk' ]];then
+            local action='add'
+            local dest="${target_repo}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp trunk/* repos/$dest/
+        else
+            local action='move'
+            local src="${source_repo}-$CARCH" dest="${target_repo}-$CARCH"
+
+            [[ -d repos/$dest ]] && git rm -r repos/$dest
+            [[ ! -d repos ]] && mkdir repos
+            [[ ! -d repos/$dest ]] && mkdir repos/$dest
+
+            cp repos/$src/* repos/$dest/
+            git rm -r repos/$src
+        fi
+
+        msg "Action: [%s] -> [%s] '%s' %s" "${source_repo}" "${target_repo}" "${package}-$ver" "${action}"
+        git add .
+        git commit -m "[${source_repo}] -> [${target_repo}] '${package}-$ver' ${action}"
+
+        if ${push};then
+            msg "Checking (%s)" "${git_tree}"
+            git pull origin master
+            git push origin master
+        fi
+    else
+        error "Package '%s' does not exist!" "${package}"
+    fi
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "source_repo: %s" "${source_repo}"
+    msg2 "target_repo: %s" "${target_repo}"
+    msg2 "package: %s" "${package}"
+
+    msg "ARGS:"
+    msg2 "remove: %s" "${remove}"
+    msg2 "push: %s" "${push}"
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+source_repo='trunk'
+package=''
+remove=false
+push=false
+pretend=false
+
+cmd=${0##*/}
+target_repo=${cmd%pkg}
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -s <name>          Source repository [default:${source_repo}]"
+    echo '    -p <pkg>           Package name'
+    echo '    -r                 Delete from repo (commitpkg only)'
+    echo '    -u                 Push'
+    echo '    -q                 Query settings and pretend'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='p:s:urqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        s) source_repo="$OPTARG" ;;
+        p) package="$OPTARG" ;;
+        r) remove=true ;;
+        u) push=true ;;
+        q) pretend=true ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+${pretend} && display_settings && exit 1
+
+if $(is_valid_repo "${source_repo}");then
+    if [[ "${cmd}" == 'commitpkg' ]];then
+        commit_pkg
+    else
+        symlink_commit_pkg
+    fi
+else
+    error "source repository '%s' is not valid!" "${source_repo}"
+fi

bin/deployiso.in

@@ -25,7 +25,6 @@ display_settings(){
     msg "OPTIONS:"
     msg2 "profile: %s" "${profile}"
     msg2 "uplimit: %s kB/s" "${uplimit}"
-#     msg2 "dist_release: %s" "${dist_release}"
 
     msg "ARGS:"
     msg2 "update: %s" "${update}"
@@ -41,7 +40,7 @@ display_settings(){
 
     msg "REMOTE:"
     msg2 "account: %s" "${account}"
-    msg2 "host: %s" "${host}"
+    msg2 "file_host: %s" "${file_host}"
     msg2 "project: %s" "${project}"
 
     msg "UPLOAD:"
@@ -79,7 +78,7 @@ opts='p:l:uvtqh'
 while getopts "${opts}" arg; do
     case "${arg}" in
         p) profile="$OPTARG" ;;
-        l) limit="$OPTARG" ;;
+        l) uplimit="$OPTARG" ;;
         u) update=true; rsync_args+=(-u) ;;
         t) torrent=true ;;
         v) verbose=true; rsync_args+=(-v --stats) ;;

bin/deploypkg.in

@@ -16,12 +16,38 @@ SYSCONFDIR='@sysconfdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
 import ${LIBDIR}/util.sh
-import ${LIBDIR}/util-pkg-publish.sh
+import ${LIBDIR}/util-pkg.sh
 
-show_transfer(){
+update_repo(){
-    local repo="$1"
+    local repo="$1" pkgfile ver ext=db.tar.xz
-    msg2 "local: %s" "${repos_local}/$repo/"
+    local repo_path=${repos_root}/$repo/os/${target_arch} packages=()
-    msg2 "remote: %s" "${repos_remote}/$repo/"
+    source PKGBUILD
+    for name in ${pkgname[@]};do
+        [[ $arch == any ]] && CARCH=any
+        ver=$(get_full_version "$name")
+        if pkgfile=$(find_cached_package "$name" "$ver" "$CARCH");then
+            local pkg=${pkgfile##*/}
+            info "Found: %s" "$pkg"
+            if ${add_pkg};then
+                local action='add'
+                packages+=("$pkg")
+#                 checkpkg $pkg
+                if ${sign_pkg};then
+                    [[ -e ${pkgfile}.sig ]] && rm ${pkgfile}.sig
+                    signfile ${pkgfile}
+                fi
+                ln -sf ${pkgfile}{,.sig} $repo_path/
+            elif ${del_pkg};then
+                local action='remove'
+                packages+=("$name")
+                [[ -e $repo_path/$pkg ]] && rm $repo_path/$pkg
+                [[ -e $repo_path/$pkg.sig ]] && rm $repo_path/$pkg.sig
+            fi
+        fi
+    done
+    cd $repo_path
+    repo-$action -R $repo.$ext ${packages[@]}
+    return 0
 }
 
 display_settings(){
@@ -30,54 +56,32 @@ display_settings(){
 
     msg "OPTIONS:"
     msg2 "repository: %s" "${repository}"
-    msg2 "package: %s" "${package}"
-    msg2 "target_arch: %s" "${target_arch}"
 
     msg "ARGS:"
     msg2 "add_pkg: %s" "${add_pkg}"
     msg2 "del_pkg: %s" "${del_pkg}"
-    msg2 "copy_pkg: %s" "${copy_pkg}"
+    msg2 "sign_pkg: %s" "${sign_pkg}"
-    msg2 "download: %s" "${download}"
-    msg2 "upload: %s" "${upload}"
-    msg2 "verbose: %s" "${verbose}"
-
-    msg "REMOTE:"
-    msg2 "account: %s" "${account}"
-    msg2 "host: %s" "${host}"
-    msg2 "project: %s" "${project}"
-
-    msg "SYNC:"
-    show_transfer "${repository}"
 }
 
 load_user_info
 
 load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
 
 pretend=false
-upload=false
-download=false
-verbose=false
-verbose=false
 add_pkg=false
 del_pkg=false
-copy_pkg=false
+repository=
-package=''
+sign_pkg=false
-
-rsync_args=(-rtxisP --progress --delete -e ssh)
 
 usage() {
     echo "Usage: ${0##*/} [options]"
-    echo "    -a                 Repository arch [default:${target_arch}]"
+    echo "    -d                 Destination repository [default:${repository}]"
-    echo "    -r                 Repository to sync [default:${repository}]"
+    echo '    -a                 Add package(s) to repository'
-    echo "    -u                 Upload repository"
+    echo '    -r                 Remove package(s) from repository'
-    echo '    -d                 Download repository'
+    echo '    -s                 Sign package(s)'
-    echo "    -p                 Package name to add/delete"
-    echo '    -x                 Add package to repository'
-    echo '    -c                 Copy instead of symlink package to repository'
-    echo '    -y                 Delete package from repository'
     echo '    -q                 Query settings and pretend upload'
-    echo '    -v                 Verbose output'
     echo '    -h                 This help'
     echo ''
     echo ''
@@ -86,20 +90,15 @@ usage() {
 
 orig_argv=("$0" "$@")
 
-opts='p:a:r:xyducvqh'
+opts='d:arsqh'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
-        a) target_arch="$OPTARG" ;;
+        d) repository="$OPTARG" ;;
-        r) repository="$OPTARG" ;;
+        a) add_pkg=true; del_pkg=false ;;
-        p) package="$OPTARG" ;;
+        r) del_pkg=true; add_pkg=false ;;
-        x) add_pkg=true ;;
+        s) sign_pkg=true ;;
-        y) del_pkg=true ;;
+        q) pretend=true ;;
-        c) copy_pkg=true ;;
-        d) download=true ;;
-        u) upload=true; rsync_args+=(-L) ;;
-        v) verbose=true; rsync_args+=(-v --stats) ;;
-        q) pretend=true; rsync_args+=(-n) ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -107,14 +106,8 @@ done
 
 shift $(($OPTIND - 1))
 
-timer_start=$(get_timer)
+prepare_dir "${repos_root}"
 
-prepare_dir "${repos_local}"
+${pretend} && display_settings && exit 1
 
-${pretend} && display_settings #&& exit 1
+update_repo "${repository}"
-
-${add_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "add" "${copy_pkg}"
-${del_pkg} && repo_update "${repository}" "${target_arch}" "${package}" "remove"
-
-${download} && repo_download "${repository}"
-${upload} && repo_upload "${repository}"

bin/fstabgen.in

@@ -64,6 +64,13 @@ optstring_apply_quirks() {
     # one might install Arch from a Fedora environment), so let's remove it.
     optstring_remove_option "$varname" seclabel
 
+    # Prune 'relatime' option for any pseudofs. This seems to be a rampant
+    # default which the kernel often exports even if the underlying filesystem
+    # doesn't support it. Example: https://bugs.archlinux.org/task/54554.
+    if awk -v fstype="$fstype" '$1 == fstype { exit 1 }' /proc/filesystems; then
+        optstring_remove_option "$varname" relatime
+    fi
+
     case $fstype in
         f2fs)
         # These are Kconfig options for f2fs. Kernels supporting the options will

bin/lddd.in

@@ -21,15 +21,15 @@ IFS="${IFS}:"
 libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)"
 extras=
 
-TMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
+TEMPDIR=$(mktemp -d --tmpdir lddd-script.XXXX)
 
 msg 'Go out and drink some tea, this will take a while :) ...'
 #  Check ELF binaries in the PATH and specified dir trees.
 for tree in $PATH $libdirs $extras; do
-    msg2 "DIR $tree"
+    msg2 "DIR %s" "$tree"
 
     #  Get list of files in tree.
-    files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
+    files=$(find "$tree" -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! \
     -name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name \
     '*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' \
     ! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' \
@@ -37,22 +37,22 @@ for tree in $PATH $libdirs $extras; do
     -name '*.mcopclass' ! -name '*.mcoptype')
     IFS=$ifs
     for i in $files; do
-        if (( $(file $i | grep -c 'ELF') != 0 )); then
+        if (( $(file "$i" | grep -c 'ELF') != 0 )); then
             #  Is an ELF binary.
-            if (( $(ldd $i 2>/dev/null | grep -c 'not found') != 0 )); then
+            if (( $(ldd "$i" 2>/dev/null | grep -c 'not found') != 0 )); then
                 #  Missing lib.
-                echo "$i:" >> $TMPDIR/raw.txt
+                echo "$i:" >> "$TEMPDIR/raw.txt"
-                ldd $i 2>/dev/null | grep 'not found' >> $TMPDIR/raw.txt
+                ldd "$i" 2>/dev/null | grep 'not found' >> "$TEMPDIR/raw.txt"
             fi
         fi
     done
 done
-grep '^/' $TMPDIR/raw.txt | sed -e 's/://g' >> $TMPDIR/affected-files.txt
+grep '^/' "$TEMPDIR/raw.txt" | sed -e 's/://g' >> "$TEMPDIR/affected-files.txt"
 # invoke pacman
-for i in $(cat $TMPDIR/affected-files.txt); do
+while read -r i; do
-    pacman -Qo $i | awk '{print $4,$5}' >> $TMPDIR/pacman.txt
+    pacman -Qo "$i" | awk '{print $4,$5}' >> "$TEMPDIR/pacman.txt"
-done
+done < "$TEMPDIR/affected-files.txt"
 # clean list
-sort -u $TMPDIR/pacman.txt >> $TMPDIR/possible-rebuilds.txt
+sort -u "$TEMPDIR/pacman.txt" >> "$TEMPDIR/possible-rebuilds.txt"
 
-msg "Files saved to $TMPDIR"
+msg "Files saved to %s" "$TEMPDIR"

bin/mkchroot.in

@@ -11,6 +11,8 @@
 
 version=@version@
 
+chroot_version=@chroot_version@
+
 LIBDIR='@libdir@'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
@@ -71,7 +73,7 @@ else
     cache_dirs=(${cache_dir})
 fi
 
-basestrap_args=(-Gcd ${pacman_conf:+-C "$pacman_conf"})
+basestrap_args=(-Gc ${pacman_conf:+-C "$pacman_conf"})
 [[ -n ${mirror} ]] && basestrap_args+=(-M)
 
 umask 0022
@@ -104,7 +106,7 @@ done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
 env -i "${_env[@]}" \
 basestrap "${basestrap_args[@]}" "$working_dir" ${cache_dirs[@]/#/--cachedir=} "$@" || die 'Failed to install all packages'
 
-echo "$version" > "$working_dir/.artools"
+echo "$chroot_version" > "$working_dir/.artools"
 
 default_locale "set" "$working_dir"
 

bin/mkchrootpkg.in

@@ -19,29 +19,6 @@ import ${LIBDIR}/util-chroot.sh
 
 shopt -s nullglob
 
-init_variables() {
-    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
-    makepkg_args=("${default_makepkg_args[@]}")
-    repack=false
-    update_first=false
-    clean_first=false
-    run_namcap=false
-    temp_chroot=false
-    chrootdir=
-    passeddir=
-    makepkg_user=
-    declare -ga install_pkgs
-    declare -gi ret=0
-
-    bindmounts_ro=()
-    bindmounts_rw=()
-
-    copy=$USER
-    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
-    [[ -z "$copy" || $copy = root ]] && copy=copy
-    src_owner=${SUDO_USER:-$USER}
-}
-
 usage() {
     echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
     echo ' Run this script in a PKGBUILD dir to build a package inside a'
@@ -121,24 +98,24 @@ sync_chroot() {
 }
 
 # Usage: delete_chroot $copydir [$copy]
-# delete_chroot() {
+delete_chroot() {
-#     local copydir=$1
+    local copydir=$1
-#     local copy=${1:-$2}
+    local copy=${1:-$2}
-#
+
-#     stat_busy "Removing chroot copy [%s]" "$copy"
+    stat_busy "Removing chroot copy [%s]" "$copy"
-#     if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
+    if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
-#         subvolume_delete_recursive "$copydir" ||
+        subvolume_delete_recursive "$copydir" ||
-#             die "Unable to delete subvolume %s" "$copydir"
+            die "Unable to delete subvolume %s" "$copydir"
-#     else
+    else
-#         # avoid change of filesystem in case of an umount failure
+        # avoid change of filesystem in case of an umount failure
-#         rm --recursive --force --one-file-system "$copydir" ||
+        rm --recursive --force --one-file-system "$copydir" ||
-#             die "Unable to delete %s" "$copydir"
+            die "Unable to delete %s" "$copydir"
-#     fi
+    fi
-#
+
-#     # remove lock file
+    # remove lock file
-#     rm -f "$copydir.lock"
+    rm -f "$copydir.lock"
-#     stat_done
+    stat_done
-# }
+}
 
 # Usage: install_packages $copydir $pkgs...
 install_packages() {
@@ -159,17 +136,17 @@ install_packages() {
     return $ret
 }
 
-# Usage: prepare_chroot $copydir $HOME $repack $run_namcap
+# Usage: prepare_chroot $copydir $HOME $keepbuilddir $run_namcap
 # Globals:
 #  - MAKEFLAGS
 #  - PACKAGER
 prepare_chroot() {
     local copydir=$1
     local USER_HOME=$2
-    local repack=$3
+    local keepbuilddir=$3
     local run_namcap=$4
 
-    $repack || rm -rf "$copydir/build"
+    [[ $keepbuilddir = true ]] || rm -rf "$copydir/build"
 
     local builduser_uid="${SUDO_UID:-$UID}"
     local builduser_gid="$(id -g "$builduser_uid")"
@@ -208,9 +185,10 @@ EOF
     {
         printf '#!/bin/bash\n'
         declare -f _chrootbuild
+        declare -p SOURCE_DATE_EPOCH 2>/dev/null || true
         printf '_chrootbuild "$@" || exit\n'
 
-        if $run_namcap; then
+        if [[ $run_namcap = true ]]; then
             declare -f _chrootnamcap
             printf '_chrootnamcap || exit\n'
         fi
@@ -221,9 +199,21 @@ EOF
 # These functions aren't run in makechrootpkg,
 # so no global variables
 _chrootbuild() {
-    export LANG=en_US.UTF-8
+    # No coredumps
+    ulimit -c 0
+
+    # Work around chroot-run not giving a ctty
+    exec </dev/console
+
     . /etc/profile
-    sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+
+    export LANG=en_US.UTF-8
+
+    # workaround meson locale errors
+    # supposedly fixed with coming python-3.7
+    locale-gen &> /dev/null
+
+    sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
 }
 
 _chrootnamcap() {
@@ -240,17 +230,18 @@ _chrootnamcap() {
 #  - USER
 download_sources() {
     local copydir=$1
-    local src_owner=$2
+    local makepkg_user=$2
 
-    local builddir="$(mktemp -d)"
+    local builddir
+    builddir="$(mktemp -d)"
     chmod 1777 "$builddir"
+#     chown "$makepkg_user:$makepkg_user" "$builddir"
 
     # Ensure sources are downloaded
-    makepkg_user=${makepkg_user:-$SUDO_USER}
+    sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \
-    sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
+        env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
-    makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
+        makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o ||
-    die "Could not download sources."
+        die "Could not download sources."
-    (( $? != 0 )) && die "Could not download sources."
 
     # Clean up garbage from verifysource
     rm -rf "$builddir"
@@ -285,6 +276,11 @@ move_products() {
     for s in "$copydir"/srcpkgdest/*; do
         chown "$src_owner" "$s"
         mv "$s" "$SRCPKGDEST"
+
+        # Fix broken symlink because of temporary chroot SRCPKGDEST /srcpkgdest
+        if [[ "$PWD" != "$SRCPKGDEST" && -L "$PWD/${s##*/}" ]]; then
+            ln -sf "$SRCPKGDEST/${s##*/}"
+        fi
     done
 }
 # }}}
@@ -292,7 +288,26 @@ move_products() {
 orig_argv=("$0" "$@")
 
 main() {
-    init_variables
+    default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg)
+    makepkg_args=("${default_makepkg_args[@]}")
+    keepbuilddir=false
+    update_first=false
+    clean_first=false
+    run_namcap=false
+    temp_chroot=false
+    chrootdir=
+    passeddir=
+    makepkg_user=
+    declare -ga install_pkgs
+    declare -gi ret=0
+
+    bindmounts_ro=()
+    bindmounts_rw=()
+
+    copy=$USER
+    [[ -n ${SUDO_USER:-} ]] && copy=$SUDO_USER
+    [[ -z "$copy" || $copy = root ]] && copy=copy
+    src_owner=${SUDO_USER:-$USER}
 
     local opts='hcur:I:l:nTD:d:U:'
 
@@ -316,7 +331,7 @@ main() {
     [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
     makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
 
-    check_root
+    check_root SOURCE_DATE_EPOCH,GNUPGHOME
 
     # Canonicalize chrootdir, getting rid of trailing /
     chrootdir=$(readlink -e "$passeddir")
@@ -332,13 +347,13 @@ main() {
     # Pass all arguments after -- right to makepkg
     makepkg_args+=("${@:$OPTIND}")
 
-    # See if -R was passed to makepkg
+    # See if -R or -e was passed to makepkg
-    for arg in "${@:OPTIND}"; do
+    for arg in "${makepkg_args[@]}"; do
         case ${arg%%=*} in
-            -*R*|--repackage)
+            --repackage|--noextract) keepbuilddir=true; break ;;
-                repack=true
+            --repackage|--noextract) keepbuilddir=true; break ;;
-                break 2
+            --*) ;;
-                ;;
+            -*R*|-*e*) keepbuilddir=true; break ;;
         esac
     done
 
@@ -379,7 +394,7 @@ main() {
 
     download_sources "$copydir" "$src_owner"
 
-    prepare_chroot "$copydir" "$USER_HOME" "$repack" "$run_namcap"
+    prepare_chroot "$copydir" "$USER_HOME" "$keepbuilddir" "$run_namcap"
 
     bindmounts_rw+=("${PWD}:/startdir" "${SRCDEST}:/srcdest")
 

bin/mkpkgclean.in

@@ -0,0 +1,93 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+version=@version@
+
+LIBDIR='@libdir@'
+SYSCONFDIR='@sysconfdir@'
+
+[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
+import ${LIBDIR}/util.sh
+
+prepare_clean(){
+    if [[ -n ${repository} ]];then
+        storage_dir=${repos_root}/${repository}/os/${target_arch}
+        paccache_args+=(-c "${storage_dir}" -k 1)
+    else
+        if [[ -n ${PKGDEST} ]];then
+            storage_dir=${PKGDEST}
+            paccache_args+=(-c "${storage_dir}" -k 4)
+        else
+            die "PKGDEST not set in makepkg.conf!"
+        fi
+    fi
+}
+
+display_settings(){
+    show_version
+    show_config
+
+    msg "OPTIONS:"
+    msg2 "repository: %s" "${repository}"
+
+    msg "PATH:"
+    msg2 "storage_dir: %s" "${storage_dir}"
+
+    msg "ARGS:"
+    msg2 "paccache_args: %s" "${paccache_args[*]}"
+
+    paccache "${paccache_args[@]}"
+}
+
+load_user_info
+
+load_config "${AT_USERCONFDIR}/artools.conf" || load_config "${SYSCONFDIR}/artools.conf"
+load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
+load_vars /etc/makepkg.conf
+
+clean=false
+pretend=false
+repository=''
+storage_dir=''
+paccache_args=(-v)
+
+usage() {
+    echo "Usage: ${0##*/} [options]"
+    echo "    -d <dir>           Directory [default:${repository}]"
+    echo '    -c                 Clean up'
+    echo '    -q                 Query settings and pretend cleaning'
+    echo '    -h                 This help'
+    echo ''
+    echo ''
+    exit $1
+}
+
+orig_argv=("$0" "$@")
+
+opts='d:cqh'
+
+while getopts "${opts}" arg; do
+    case "${arg}" in
+        d) repository="$OPTARG" ;;
+        c) clean=true ; paccache_args+=(-r) ;;
+        q) pretend=true; paccache_args+=(-d) ;;
+        h|?) usage 0 ;;
+        *) echo "invalid argument '${arg}'"; usage 1 ;;
+    esac
+done
+
+shift $(($OPTIND - 1))
+
+prepare_clean
+
+${pretend} && display_settings && exit 1
+
+${clean} && paccache "${paccache_args[@]}"

bin/signfile.in

@@ -21,10 +21,16 @@ load_user_info
 load_vars "${PAC_USERCONFDIR}/makepkg.conf" || load_vars "$USER_HOME/.makepkg.conf"
 load_vars /etc/makepkg.conf
 
+file_to_sign="$1"
+
 if [ ! -e "$1" ]; then
-    error "%s does not exist!" "$1"
+    error "%s does not exist!" "$file_to_sign"
     exit 1
 fi
 
-msg2 "Signing [%s] with key %s" "${1##*/}" "${GPGKEY}..."
+msg2 "Signing [%s] with key %s" "${file_to_sign##*/}" "${GPGKEY}..."
-gpg --detach-sign --use-agent -u "${GPGKEY}" "$1"
+if [[ -n "${BUILDBOT_GPGP}" ]]; then
+    gpg --batch --passphrase "${BUILDBOT_GPGP}" --detach-sign "$file_to_sign"
+else
+    gpg --detach-sign --use-agent -u "${GPGKEY}" "$file_to_sign"
+fi

bin/signpkgs.in

@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-version=@version@
-
-find $PWD -maxdepth 1 -name '*.pkg.tar.xz' -exec signfile {} \;

data/artools.conf

@@ -2,14 +2,52 @@
 ################ artools-base ###############
 #############################################
 
-# default taget arch: auto detect
-# target_arch=$(uname -m)
-
 # build dir where buildpkg or buildiso chroots are created
 # chroots_dir=/var/lib/artools
 
-# custom build mirror server
+# the workspace directory
-# build_mirror=https://netcologne.dl.sourceforge.net/project/artix-linux/repos
+# workspace_dir="/home/${OWNER}/artools-workspace"
+
+#############################################
+################ artools-pkg ################
+#############################################
+
+# host_tree_artix='https://github.com/artix-linux'
+
+# host_tree_arch=git://projects.archlinux.org/svntogit
+
+# default repos root
+# repos_root=${workspace_dir}/repos
+
+#############################################
+################ artools-iso ################
+#############################################
+
+# the iso storage directory
+# iso_pool="${workspace_dir}/iso"
+
+# the dist release; default: auto
+# iso_version=$(date +%Y%m%d)
+
+# possible values: openrc, (s6, runit) not yet supported
+# initsys="openrc"
+
+# unset defaults to given value
+# kernel="linux"
+
+# custom additional kernel args
+# kernel_args=""
+
+# gpg key; leave empty or commented to skip sfs signing
+# gpgkey=""
+
+# set upload bandwidth limit in kB/s
+# uplimit=100
+
+# the torrent tracker urls, comma separated
+# tracker_url='udp://mirror.strits.dk:6969'
+
+# file_host="sourceforge.net"
 
 # the server user
 # account=[SetUser]
@@ -20,54 +58,5 @@
 # host mirrors
 # host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
 
-# the workspace directory
-# workspace_dir="/home/${OWNER}/artools-workspace"
-
-#############################################
-################ artools-pkg ################
-#############################################
-
-# artix import tree
-# repo_tree_import=('system-arch' 'world-arch' 'galaxy-arch')
-
-# host_tree_artix=https://github.com/artix-linux
-
-# archlinux package tree
-# repo_tree_arch=('packages' 'community')
-
-# host_tree_arch=git://projects.archlinux.org/svntogit
-
-# default repos root
-# repos_local=${workspace_dir}/repos
-
-#############################################
-################ artools-iso ################
-#############################################
-
-# the default profile
-# profile=base
-
-# the dist release; default: auto
-# dist_release=rolling
-
-# the branding; default: auto
-# dist_branding="ARTIX"
-
-# possible values: openrc, (s6, runit) not yet supported
-# initsys="openrc"
-
-# unset defaults to given value
-# kernel="linux-lts"
-
-# gpg key; leave empty or commented to skip sfs signing
-# gpgkey=""
-
-# set upload bandwidth limit in kB/s
-# limit=100
-
-# the torrent tracker urls, comma separated
-# tracker_url='udp://mirror.strits.dk:6969'
-
 # Piece size, 2^n
 # piece_size=21
-

data/base/Packages-Live

@@ -3,7 +3,4 @@ nbd
 >openrc artix-live-openrc
 squashfs-tools
 artix-live-portable-efi
-virtualbox-guest-modules-artix
-virtualbox-guest-utils
 linux-lts-headers
-

data/base/Packages-Root

@@ -43,6 +43,7 @@ man-pages
 memtest86+
 mkinitcpio-openswap
 nano
+net-tools
 ntfs-3g
 >openrc acpid-openrc
 >openrc cronie-openrc
@@ -58,6 +59,7 @@ ntfs-3g
 >openrc nfs-utils-openrc
 >openrc rsync-openrc
 >openrc wpa_supplicant-openrc
+>openrc opentmpfiles
 os-prober
 pacman
 pciutils
@@ -76,7 +78,7 @@ texinfo
 usbutils
 util-linux
 which
->x86_64 efibootmgr
+efibootmgr
 xfsprogs
 zd1211-firmware
 zsh

data/base/profile.conf

@@ -8,19 +8,20 @@
 # autologin="true"
 
 # service runlevels
-# openrc_boot=('elogind')
+# services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
 
-# unset defaults to given values
+# default values
 # addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
 
+# netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
+
 ################# live-session #################
 
-# unset defaults to given value
+# default value
 # hostname="artix"
 
-# unset defaults to given value
+# default value
 # username="artix"
 
-# unset defaults to given value
+# default value
 # password="artix"

data/import.list.d/galaxy-arch.list

@@ -1,6 +0,0 @@
-autoconf-archive
-confuse
-libappindicator
-libdbusmenu
-libftdi
-libindicator

data/import.list.d/system-arch.list

@@ -1,145 +0,0 @@
-acl
-archlinux-keyring
-attr
-autoconf
-automake
-b43-fwcutter
-binutils
-bison
-bridge-utils
-bzip2
-ca-certificates
-ca-certificates-cacert
-coreutils
-cracklib
-curl
-dash
-db
-dialog
-diffutils
-ding-libs
-dnssec-anchors
-dosfstools
-e2fsprogs
-ed
-efibootmgr
-efivar
-elfutils
-expat
-fakeroot
-file
-findutils
-flex
-gawk
-gcc
-gdbm
-gettext
-glib2
-gmp
-gnutls
-gpgme
-grep
-groff
-gzip
-hdparm
-hwids
-iana-etc
-icu
-ifenslave
-iproute2
-iputils
-ipw2100-fw
-ipw2200-fw
-isdn4k-utils
-iw
-jfsutils
-kbd
-keyutils
-ldns
-less
-libaio
-libarchive
-libassuan
-libcap
-libedit
-libevent
-libffi
-libgcrypt
-libgpg-error
-libgssglue
-libidn
-libksba
-libmnl
-libmpc
-libnftnl
-libnghttp2
-libnl
-libpcap
-libpipeline
-libpsl
-librpcsecgss
-libseccomp
-libsecret
-libssh2
-libtasn1
-libtirpc
-libtool
-libunistring
-licenses
-links
-linux-api-headers
-linux-atm
-linux-firmware
-lz4
-lzo
-m4
-make
-man-pages
-mkinitcpio-busybox
-mkinitcpio-nfs-utils
-mpfr
-nano
-nettle
-net-tools
-nfsidmap
-nilfs-utils
-npth
-nspr
-nss
-openssl
-openssl-1.0
-p11-kit
-patch
-pciutils
-pcre
-perl
-pinentry
-pkcs11-helper
-pkg-config
-popt
-pptpclient
-procinfo-ng
-psmisc
-pth
-reiserfsprogs
-run-parts
-sdparm
-sed
-s-nail
-sqlite
-sysfsutils
-syslinux
-tar
-texinfo
-thin-provisioning-tools
-traceroute
-tzdata
-usbutils
-vi
-which
-wireless-regdb
-wireless_tools
-wpa_actiond
-xfsprogs
-xz
-zd1211-firmware

data/import.list.d/world-arch.list

@@ -1,212 +0,0 @@
-qt5-3d
-qt5-canvas3d
-qt5-charts
-qt5-connectivity
-qt5-datavis3d
-qt5-declarative
-qt5-doc
-qt5-examples
-qt5-gamepad
-qt5-graphicaleffects
-qt5-imageformats
-qt5-location
-qt5-multimedia
-qt5-networkauth
-qt5-quickcontrols
-qt5-quickcontrols2
-qt5-remoteobjects
-qt5-script
-qt5-scxml
-qt5-sensors
-qt5-serialbus
-qt5-serialport
-qt5-speech
-qt5-svg
-qt5-tools
-qt5-translations
-qt5-virtualkeyboard
-qt5-wayland
-qt5-webchannel
-qt5-webengine
-qt5-webkit
-qt5-websockets
-qt5-webview
-qt5-x11extras
-qt5-xmlpatterns
-adwaita-icon-theme
-alsa-lib
-apr
-apr-util
-atk
-at-spi2-atk
-at-spi2-core
-boost
-cairo
-cantarell-fonts
-check
-compositeproto
-damageproto
-dbus-glib
-dconf
-desktop-file-utils
-docbook-dsssl
-docbook-sgml31
-docbook-utils
-docbook-xml
-docbook-xsl
-double-conversion
-doxygen
-eventlog
-fixesproto
-fontconfig
-fontsproto
-freetype2
-gd
-gdk-pixbuf2
-ghostscript
-giflib
-gnome-common
-gobject-introspection
-gptfdisk
-graphite
-graphviz
-gsfonts
-gtk3
-gtk-doc
-gts
-harfbuzz
-hicolor-icon-theme
-ijs
-inputproto
-intltool
-itstool
-jasper
-jbig2dec
-json-glib
-kbproto
-lcms2
-libasyncns
-libblockdev
-libbytesize
-libcap-ng
-libcroco
-libdaemon
-libdatrie
-libdrm
-libepoxy
-libexif
-libfontenc
-libglvnd
-libgphoto2
-libical
-libice
-libieee1284
-libimobiledevice
-libiscsi
-libjpeg-turbo
-libomxil-bellagio
-libpaper
-libpciaccess
-libplist
-libpng
-libproxy
-librsvg
-libsm
-libthai
-libtiff
-libtxc_dxtn
-libunwind
-libusb-compat
-libusbmuxd
-libwebp
-libx11
-libxau
-libxaw
-libxcb
-libxcomposite
-libxcursor
-libxdamage
-libxdmcp
-libxext
-libxfixes
-libxfont
-libxfont2
-libxft
-libxi
-libxinerama
-libxkbcommon
-libxkbfile
-libxml2
-libxmu
-libxpm
-libxrandr
-libxrender
-libxshmfence
-libxslt
-libxt
-libxtst
-libxxf86vm
-lirc
-llvm
-mesa
-mtdev
-net-snmp
-openjade
-opensp
-pango
-parted
-pcre2
-perl-error
-perl-xml-parser
-perl-yaml
-pixman
-python2
-python
-python-appdirs
-python-beaker
-python-mako
-python-markupsafe
-python-packaging
-python-pyparsing
-python-setuptools
-python-six
-randrproto
-recordproto
-renderproto
-serf
-sgml-common
-shared-mime-info
-source-highlight
-speexdsp
-tslib
-v4l-utils
-vala
-valgrind
-volume_key
-vte3
-vte
-wayland
-wayland-protocols
-xcb-proto
-xcb-util
-xcb-util-image
-xcb-util-keysyms
-xcb-util-renderutil
-xcb-util-wm
-xextproto
-xf86vidmodeproto
-xineramaproto
-xkeyboard-config
-xorg-bdftopcf
-xorg-fonts-alias
-xorg-fonts-encodings
-xorg-fonts-misc
-xorg-font-util
-xorg-font-utils
-xorg-mkfontdir
-xorg-mkfontscale
-xorg-setxkbmap
-xorg-xkbcomp
-xproto
-yelp-tools
-yelp-xsl

data/linux.preset

@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-@kernel@-@arch@"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-@kernel@-@arch@.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-@kernel@-@arch@-fallback.img"
-fallback_options="-S autodetect"

data/make.conf.d/i686.conf

@@ -1,3 +0,0 @@
-carch="i686"
-chost="i686-pc-linux-gnu"
-cflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/make.conf.d/multilib.conf

@@ -1,3 +0,0 @@
-carch="x86_64"
-chost="x86_64-pc-linux-gnu"
-cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/make.conf.d/x86_64.conf

@@ -1,3 +0,0 @@
-carch="x86_64"
-chost="x86_64-pc-linux-gnu"
-cflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"

data/makepkg.conf

@@ -20,26 +20,26 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %
 # /usr/bin/wget
 
 #-- The package required by makepkg to download VCS sources
-# Format: 'protocol::package'
+#  Format: 'protocol::package'
 VCSCLIENTS=('bzr::bzr'
-	    'git::git'
+            'git::git'
-	    'hg::mercurial'
+            'hg::mercurial'
-	    'svn::subversion')
+            'svn::subversion')
 
 #########################################################################
 # ARCHITECTURE, COMPILE FLAGS
 #########################################################################
 #
-CARCH="@CARCH@"
+CARCH="x86_64"
-CHOST="@CHOST@"
+CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
 CPPFLAGS="-D_FORTIFY_SOURCE=2"
-CFLAGS="@CFLAGS@"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-CXXFLAGS="@CFLAGS@"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
-LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
@@ -50,10 +50,9 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 # BUILD ENVIRONMENT
 #########################################################################
 #
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign)
+# Defaults: BUILDENV=(!distcc color !ccache check !sign)
 #  A negated environment option will do the opposite of the comments below.
 #
-#-- fakeroot: Allow building packages as a non-root user
 #-- distcc:   Use the Distributed C/C++/ObjC compiler
 #-- color:    Colorize output messages
 #-- ccache:   Use ccache to cache compilation
@@ -85,6 +84,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- upx:        Compress binary executable files using UPX
+#-- optipng:    Optimize PNG images with optipng
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
 OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)

data/mkinitcpio.conf

@@ -1,3 +1,5 @@
-MODULES="loop dm-snapshot"
+MODULES=(loop dm-snapshot)
-HOOKS="base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block pcmcia filesystems keyboard keymap"
+
+HOOKS=(base udev artix_shutdown artix artix_loop_mnt artix_pxe_common artix_pxe_http artix_pxe_nbd artix_pxe_nfs artix_kms modconf block pcmcia filesystems keyboard keymap)
+
 COMPRESSION="xz"

data/pacman-default.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -73,14 +73,9 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
-# An example of a custom package repository.  See the pacman manpage for
+#
-# tips on creating your own repositories.
+# ARCHLINUX
-#[custom]
+#
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
-# [core]
-# Include = /etc/pacman.d/mirrorlist-arch
 
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch

data/pacman-goblins.conf

@@ -0,0 +1,108 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+#
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-gremlins.conf

@@ -0,0 +1,96 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+#
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32-goblins.conf

@@ -0,0 +1,126 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32-goblins]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32]
+Include = /etc/pacman.d/mirrorlist
+
+# 
+# ARCHLINUX
+#
+
+[staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-staging]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32-gremlins.conf

@@ -0,0 +1,108 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate archlinux cromnix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+
+[gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32-gremlins]
+Include = /etc/pacman.d/mirrorlist
+
+[lib32]
+Include = /etc/pacman.d/mirrorlist
+
+# 
+# ARCHLINUX
+#
+
+[testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[extra]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[community]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib-testing]
+Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/pacman-lib32.conf

@@ -34,7 +34,7 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -73,23 +73,18 @@ Include = /etc/pacman.d/mirrorlist
 [galaxy]
 Include = /etc/pacman.d/mirrorlist
 
-# If you want to run 32 bit applications on your x86_64 system,
+[lib32]
-# enable the multilib repositories as required here.
+Include = /etc/pacman.d/mirrorlist
 
-[multilib]
+# 
-Include = /etc/pacman.d/mirrorlist-arch
+# ARCHLINUX
-
+#
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
-# [core]
-# Include = /etc/pacman.d/mirrorlist-arch
 
 [extra]
 Include = /etc/pacman.d/mirrorlist-arch
 
 [community]
 Include = /etc/pacman.d/mirrorlist-arch
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist-arch

data/patches/artix-bash.patch

@@ -0,0 +1,87 @@
+--- /dev/null
++++ b/artix.bashrc
+@@ -0,0 +1,46 @@
++use_color=true
++
++# Set colorful PS1 only on colorful terminals.
++# dircolors --print-database uses its own built-in database
++# instead of using /etc/DIR_COLORS.  Try to use the external file
++# first to take advantage of user additions.  Use internal bash
++# globbing instead of external grep binary.
++safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
++match_lhs=""
++[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
++[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
++[[ -z ${match_lhs}    ]] \
++	&& type -P dircolors >/dev/null \
++	&& match_lhs=$(dircolors --print-database)
++[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
++
++if ${use_color} ; then
++	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
++	if type -P dircolors >/dev/null ; then
++		if [[ -f ~/.dir_colors ]] ; then
++			eval $(dircolors -b ~/.dir_colors)
++		elif [[ -f /etc/DIR_COLORS ]] ; then
++			eval $(dircolors -b /etc/DIR_COLORS)
++		fi
++	fi
++
++	if [[ ${EUID} == 0 ]] ; then
++		PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
++	else
++		PS1='\[\033[01;36m\][\u@\h\[\033[01;37m\] \W\[\033[01;36m\]]\$\[\033[00m\] '
++	fi
++
++	alias ls='ls --color=auto'
++	alias grep='grep --colour=auto'
++	alias egrep='egrep --colour=auto'
++	alias fgrep='fgrep --colour=auto'
++else
++	if [[ ${EUID} == 0 ]] ; then
++		# show root@ when we don't have colors
++		PS1='\u@\h \W \$ '
++	else
++		PS1='\u@\h \w \$ '
++	fi
++fi
++
++unset use_color safe_term match_lhs sh
+--- a/dot.bashrc
++++ b/dot.bashrc
+@@ -5,5 +5,5 @@
+ # If not running interactively, don't do anything
+ [[ $- != *i* ]] && return
+
+-alias ls='ls --color=auto'
+-PS1='[\u@\h \W]\$ '
++# alias ls='ls --color=auto'
++# PS1='[\u@\h \W]\$ '
+
+--- a/system.bashrc
++++ a/system.bashrc
+@@ -1,5 +1,5 @@
+ #
+-# /etc/bash.bashrc
++# /etc/bash/bashrc
+ #
+
+ # If not running interactively, don't do anything
+@@ -19,4 +19,8 @@
+     ;;
+ esac
+
++for sh in /etc/bash/bashrc.d/*.bashrc ; do
++	[[ -r ${sh} ]] && source "${sh}"
++done
++
+ [ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
+
+--- a/system.bash_logout
++++ a/system.bash_logout
+@@ -1,3 +1,3 @@
+ #
+-# /etc/bash.bash_logout
++# /etc/bash/bash_logout
+ #
+

data/pkg.list.d/default.list

@@ -1 +0,0 @@
-openrc

data/profile.conf.example

@@ -1,30 +0,0 @@
-##########################################
-###### use this file in the profile ######
-##########################################
-
-################ install ################
-
-# default displaymanager: none
-# supported; lightdm, sddm, gdm, lxdm, mdm
-# displaymanager="none"
-
-# Set to false to disable autologin in the livecd
-# autologin="true"
-
-# service runlevels
-# openrc_boot=('elogind')
-# openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
-
-# unset defaults to given values
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
-
-################# live-session #################
-
-# unset defaults to given value
-# hostname="artix"
-
-# unset defaults to given value
-# username="artix"
-
-# unset defaults to given value
-# password="artix"

data/repo_info

@@ -1 +0,0 @@
-0.5

initcpio/hooks/artix

@@ -102,7 +102,7 @@ _mnt_dev() {
 _verify_checksum() {
     local _status
     cd "/run/artix/bootmnt/${artixbasedir}/${arch}"
-    md5sum -c $1.md5 > /tmp/checksum.log 2>&1
+    sha512sum -c $1.sha512 > /tmp/checksum.log 2>&1
     _status=$?
     cd "${OLDPWD}"
     return ${_status}
@@ -120,7 +120,7 @@ _verify_signature() {
 run_hook() {
     [[ -z "${arch}" ]] && arch="$(uname -m)"
     [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
-    [[ -z "${artixbasedir}" ]] && artixbasedir="cromnix"
+    [[ -z "${artixbasedir}" ]] && artixbasedir="artix"
 
     [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
     [[ -z "${artixdevice}" ]] && artixdevice="/dev/disk/by-label/${artixlabel}"
@@ -160,7 +160,7 @@ artix_mount_handler() {
     if [[ "${checksum}" == "y" ]]; then
         for fs in rootfs desktopfs livefs;do
             if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.md5" ]]; then
+                if [[ -f "/run/artix/bootmnt/${artixbasedir}/${arch}/${fs}.sha512" ]]; then
                     msg -n ":: Self-test requested, please wait..."
                     if _verify_checksum "${fs}"; then
                         msg "done. Checksum is OK, continue booting."
@@ -170,7 +170,7 @@ artix_mount_handler() {
                         launch_interactive_shell
                     fi
                 else
-                    echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.md5 not found"
+                    echo "ERROR: checksum=y option specified but ${artixbasedir}/${arch}/${fs}.sha512 not found"
                     launch_interactive_shell
                 fi
             fi

initcpio/hooks/miso

@@ -1,245 +0,0 @@
-# args: source, newroot, mountpoint
-_mnt_dmsnapshot() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}";
-    local img_name="${img_fullname%%.*}"
-    local dm_snap_name="${dm_snap_prefix}_${img_name}"
-    local ro_dev ro_dev_size rw_dev
-
-    ro_dev=$(losetup --find --show --read-only "${img}")
-    echo ${ro_dev} >> /run/miso/used_block_devices
-    ro_dev_size=$(blockdev --getsz ${ro_dev})
-
-    if [[ "${cow_persistent}" == "P" ]]; then
-        if [[ -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '/run/miso/cowspace/${cow_directory}/${img_name}.cow', using as persistent."
-        else
-            msg ":: Creating '/run/miso/cowspace/${cow_directory}/${img_name}.cow' as persistent."
-            truncate -s "${cow_spacesize}" "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
-        fi
-    else
-        if [[ -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow" ]]; then
-            msg ":: Found '/run/miso/cowspace/${cow_directory}/${img_name}.cow' but non-persistent requested, removing."
-            rm -f "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
-        fi
-        msg ":: Creating '/run/miso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent."
-        truncate -s "${cow_spacesize}" "/run/miso/cowspace/${cow_directory}/${img_name}.cow"
-    fi
-
-    rw_dev=$(losetup --find --show "/run/miso/cowspace/${cow_directory}/${img_name}.cow")
-    echo ${rw_dev} >> /run/miso/used_block_devices
-
-    dmsetup create ${dm_snap_name} --table "0 ${ro_dev_size} snapshot ${ro_dev} ${rw_dev} ${cow_persistent} ${cow_chunksize}"
-
-    _mnt_dev "/dev/mapper/${dm_snap_name}" "${mnt}" "-w" "defaults"
-    echo $(readlink -f /dev/mapper/${dm_snap_name}) >> /run/miso/used_block_devices
-}
-
-# args: source, newroot, mountpoint
-_mnt_overlayfs() {
-    local src="${1}"
-    local newroot="${2}"
-    local mnt="${3}"
-    local work_dir="/run/miso/overlay_root/work"
-    local upper_dir="/run/miso/overlay_root/upper"
-
-    mkdir -p "${upper_dir}" "${work_dir}"
-
-    mount -t overlay overlay -o lowerdir="${src}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
-}
-
-# args: /path/to/image_file, mountpoint
-_mnt_sfs() {
-    local img="${1}"
-    local mnt="${2}"
-    local img_fullname="${img##*/}"
-    local sfs_dev
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg -n ":: Copying squashfs image to RAM..."
-        if ! cp "${img}" "/run/miso/copytoram/${img_fullname}" ; then
-            echo "ERROR: while copy '${img}' to '/run/miso/copytoram/${img_fullname}'"
-            launch_interactive_shell
-        fi
-        img="/run/miso/copytoram/${img_fullname}"
-        msg "done."
-    fi
-    sfs_dev=$(losetup --find --show --read-only "${img}")
-    echo ${sfs_dev} >> /run/miso/used_block_devices
-    _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
-}
-
-# args: device, mountpoint, flags, opts
-_mnt_dev() {
-    local dev="${1}"
-    local mnt="${2}"
-    local flg="${3}"
-    local opts="${4}"
-
-    mkdir -p "${mnt}"
-
-    msg ":: Mounting '${dev}' to '${mnt}'"
-
-    while ! poll_device "${dev}" 30; do
-        echo "ERROR: '${dev}' device did not show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
-        msg ":: Device '${dev}' mounted successfully."
-    else
-        echo "ERROR; Failed to mount '${dev}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-_verify_checksum() {
-    local _status
-    cd "/run/miso/bootmnt/${misobasedir}/${arch}"
-    md5sum -c $1.md5 > /tmp/checksum.log 2>&1
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-_verify_signature() {
-    local _status
-    cd "/run/miso/bootmnt/${misobasedir}/${arch}"
-    gpg --homedir /gpg --status-fd 1 --verify $1.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
-    _status=$?
-    cd "${OLDPWD}"
-    return ${_status}
-}
-
-run_hook() {
-    [[ -z "${arch}" ]] && arch="$(uname -m)"
-    [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
-    [[ -z "${misobasedir}" ]] && misobasedir="cromnix"
-
-    [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch"
-    [[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}"
-    [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M"
-    [[ -z "${overlay_root_size}" ]] && overlay_root_size="75%"
-
-    if [[ -n "${cow_label}" ]]; then
-        cow_device="/dev/disk/by-label/${cow_label}"
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    elif [[ -n "${cow_device}" ]]; then
-        [[ -z "${cow_persistent}" ]] && cow_persistent="P"
-    else
-        cow_persistent="N"
-    fi
-
-    [[ -z "${cow_flags}" ]] && cow_flags="defaults"
-    [[ -z "${cow_directory}" ]] && cow_directory="persistent_${misolabel}/${arch}"
-    [[ -z "${cow_chunksize}" ]] && cow_chunksize="8"
-
-    # set mount handler for miso
-    mount_handler="miso_mount_handler"
-}
-
-# This function is called normally from init script, but it can be called
-# as chain from other mount handlers.
-# args: /path/to/newroot
-miso_mount_handler() {
-    local newroot="${1}"
-
-    if ! mountpoint -q "/run/miso/bootmnt"; then
-        _mnt_dev "${misodevice}" "/run/miso/bootmnt" "-r" "defaults"
-        if [[ "${copytoram}" != "y" ]]; then
-            echo $(readlink -f ${misodevice}) >> /run/miso/used_block_devices
-        fi
-    fi
-
-    if [[ "${checksum}" == "y" ]]; then
-        for fs in rootfs desktopfs livefs;do
-            if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then
-                    msg -n ":: Self-test requested, please wait..."
-                    if _verify_checksum "${fs}"; then
-                        msg "done. Checksum is OK, continue booting."
-                    else
-                        echo "ERROR: one or more files are corrupted"
-                        echo "see /tmp/checksum.log for details"
-                        launch_interactive_shell
-                    fi
-                else
-                    echo "ERROR: checksum=y option specified but ${misobasedir}/${arch}/${fs}.md5 not found"
-                    launch_interactive_shell
-                fi
-            fi
-        done
-    fi
-
-    if [[ "${verify}" == "y" ]]; then
-        for fs in rootfs desktopfs livefs;do
-            if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs" ]]; then
-                if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then
-                    msg -n ":: Signature verification requested, please wait..."
-                    if _verify_signature "${fs}"; then
-                        msg "done. Signature is OK, continue booting."
-                    else
-                        echo "ERROR: one or more files are corrupted"
-                        launch_interactive_shell
-                    fi
-                else
-                    echo "ERROR: verify=y option specified but ${misobasedir}/${arch}/${fs}.sfs.sig not found"
-                    launch_interactive_shell
-                fi
-            fi
-        done
-    fi
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Mounting /run/miso/copytoram (tmpfs) filesystem, size=${copytoram_size}"
-        mkdir -p /run/miso/copytoram
-        mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /run/miso/copytoram
-    fi
-
-    if [[ -n "${cow_device}" ]]; then
-        _mnt_dev "${cow_device}" "/run/miso/cowspace" "-r" "${cow_flags}"
-        echo $(readlink -f ${cow_device}) >> /run/miso/used_block_devices
-        mount -o remount,rw "/run/miso/cowspace"
-    else
-        msg ":: Mounting /run/miso/cowspace (tmpfs) filesystem, size=${cow_spacesize}..."
-        mkdir -p /run/miso/cowspace
-        mount -t tmpfs -o "size=${cow_spacesize}",mode=0755 cowspace /run/miso/cowspace
-    fi
-    mkdir -p -m 0700 "/run/miso/cowspace/${cow_directory}"
-
-    msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..."
-    mkdir -p /run/miso/overlay_root
-    mount -t tmpfs -o "size=${overlay_root_size}",mode=0755 overlay_root /run/miso/overlay_root
-
-    local src="/run/miso/bootmnt/${misobasedir}/${arch}"
-    local dest_sfs="/run/miso/sfs" dest_img="/run/miso/img"
-    local lower_dir
-
-    for sfs in livefs desktopfs rootfs;do
-        if [[ -f "${src}/${sfs}.sfs" ]]; then
-            _mnt_sfs "${src}/${sfs}.sfs" "${dest_sfs}/${sfs}"
-            if [[ -f "${dest_sfs}/${sfs}/${sfs}.img" ]]; then
-                mkdir -p ${dest_img}
-                lower_dir=${lower_dir:-}${lower_dir:+:}"${dest_img}/${sfs}"
-                _mnt_dmsnapshot "${dest_sfs}/${sfs}/${sfs}.img" "${dest_img}/${sfs}"
-            else
-                lower_dir=${lower_dir:-}${lower_dir:+:}"${dest_sfs}/${sfs}"
-            fi
-        fi
-    done
-
-    _mnt_overlayfs "${lower_dir}" "${newroot}" "/"
-
-    if [[ "${copytoram}" == "y" ]]; then
-        umount -d /run/miso/bootmnt
-        mkdir -p /run/miso/bootmnt/${misobasedir}/${arch}
-        mount -o bind /run/miso/copytoram /run/miso/bootmnt/${misobasedir}/${arch}
-    fi
-}
-
-# vim:ft=sh:ts=4:sw=4:et:

initcpio/hooks/miso_loop_mnt

@@ -1,35 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    [[ -n "${img_label}" ]] && img_dev="/dev/disk/by-label/${img_label}"
-    [[ -z "${img_flags}" ]] && img_flags="defaults"
-    if [[ -n "${img_dev}" && -n "${img_loop}" ]]; then
-        mount_handler="miso_loop_mount_handler"
-    fi
-}
-
-miso_loop_mount_handler () {
-    newroot="${1}"
-
-    local _dev_loop
-
-    msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
-    _mnt_dev "${img_dev}" "/run/miso/img_dev" "-r" "${img_flags}"
-    if [[ "${copytoram}" != "y" ]]; then
-        echo $(readlink -f ${img_dev}) >> /run/miso/used_block_devices
-    fi
-
-    if _dev_loop=$(losetup --find --show --read-only "/run/miso/img_dev/${img_loop}"); then
-        misodevice="${_dev_loop}"
-    else
-        echo "ERROR: Setting loopback device for file '/run/miso/img_dev/${img_loop}'"
-        launch_interactive_shell
-    fi
-
-    miso_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        losetup -d ${_dev_loop} 2>/dev/null
-        umount /run/miso/img_dev
-    fi
-}

initcpio/hooks/miso_pxe_common

@@ -1,72 +0,0 @@
-# vim: set ft=sh:
-
-run_hook () {
-    # Do *not* declare 'bootif_dev' local! We need it in run_latehook().
-    local i net_mac bootif_mac
-    # These variables will be parsed from /tmp/net-*.conf generated by ipconfig
-    local DEVICE
-    local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
-    local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
-    local filename
-    # /tmp/net-*.conf
-
-    if [[ -n "${ip}" ]]; then
-        if [[ -n "${BOOTIF}" ]]; then
-            bootif_mac=${BOOTIF#01-}
-            bootif_mac=${bootif_mac//-/:}
-            for i in /sys/class/net/*/address; do
-                read net_mac < ${i}
-                if [[ "${bootif_mac}" == "${net_mac}" ]]; then
-                    bootif_dev=${i#/sys/class/net/}
-                    bootif_dev=${bootif_dev%/address}
-                    break
-                fi
-            done
-            if [[ "${ip}" == "dhcp" ]]; then
-               ip=":::::${bootif_dev}:dhcp"
-            else
-               ip="${ip}::${bootif_dev}"
-           fi
-        fi
-
-        # setup network and save some values
-        if ! ipconfig -t 20 "ip=${ip}"; then
-                echo "ERROR; Failed to configure network"
-                echo "   Falling back to interactive prompt"
-                echo "   You can try to fix the problem manually, log out when you are finished"
-                launch_interactive_shell
-        fi
-
-        . /tmp/net-*.conf
-
-        pxeserver=${ROOTSERVER}
-
-        # setup DNS resolver
-        if [[ "${IPV4DNS0}" != "0.0.0.0" ]]; then
-            echo "# added by miso_pxe_common hook" > /etc/resolv.conf
-            echo "nameserver ${IPV4DNS0}" >> /etc/resolv.conf
-        fi
-        if [[ "${IPV4DNS1}" != "0.0.0.0" ]]; then
-            echo "nameserver ${IPV4DNS1}" >> /etc/resolv.conf
-        fi
-        if [[ -n "${DNSDOMAIN}" ]]; then
-            echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
-            echo "domain ${DNSDOMAIN}" >> /etc/resolv.conf
-        fi
-    fi
-}
-
-run_latehook () {
-    if [[ -n "${ip}" ]]; then
-        [[ -z "${copy_resolvconf}" ]] && copy_resolvconf="y"
-
-        if [[ "${copytoram}" == "y" ]]; then
-            if [[ -n "${bootif_dev}" ]]; then
-                ip addr flush dev "${bootif_dev}"
-                ip link set "${bootif_dev}" down
-            fi
-        elif [[ "${copy_resolvconf}" != "n" && -f /etc/resolv.conf ]]; then
-            cp /etc/resolv.conf /new_root/etc/resolv.conf
-        fi
-    fi
-}

initcpio/hooks/miso_pxe_http

@@ -1,59 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${miso_http_srv}" ]]; then
-
-        # booting with http is always copy-to-ram, so set here to make sure
-        # addresses are flushed and interface is set down
-        copytoram="y"
-
-        miso_http_srv=$(eval echo ${miso_http_srv})
-        [[ -z "${miso_http_spc}" ]] && miso_http_spc="75%"
-
-        mount_handler="miso_pxe_http_mount_handler"
-    fi
-}
-
-# Fetch a file with CURL
-#
-# $1 URL
-# $2 Destination directory inside httpspace/${misobasedir}
-_curl_get() {
-    local _url="${1}"
-    local _dst="${2}"
-
-    msg ":: Downloading '${_url}'"
-    if ! curl -L -f -o "/run/miso/httpspace/${misobasedir}${_dst}/${_url##*/}" --create-dirs "${_url}"; then
-        echo "ERROR: Downloading '${_url}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-}
-
-miso_pxe_http_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Mounting /run/miso/httpspace (tmpfs) filesystem, size='${miso_http_spc}'"
-    mkdir -p "/run/miso/httpspace"
-    mount -t tmpfs -o size="${miso_http_spc}",mode=0755 httpspace "/run/miso/httpspace"
-
-    local _src=${miso_http_srv}${misobasedir}/${arch}
-
-    for sfs in livefs desktopfs rootfs;do
-        if [[ ! -z "$( curl -s --head "${_src}/${sfs}.sfs" | grep "OK" )" ]]; then
-            _curl_get "${_src}/${sfs}.sfs" "/${arch}"
-
-            if [[ "${checksum}" == "y" ]]; then
-                _curl_get "${_src}/${sfs}.md5" "/${arch}"
-            fi
-            if [[ "${verify}" == "y" ]]; then
-                _curl_get "${_src}/${sfs}.sfs.sig" "/${arch}"
-            fi
-        fi
-    done
-    mkdir -p "/run/miso/bootmnt"
-    mount -o bind /run/miso/httpspace /run/miso/bootmnt
-
-    miso_mount_handler ${newroot}
-}

initcpio/hooks/miso_pxe_nbd

@@ -1,47 +0,0 @@
-# vim: set ft=sh:
-
-run_earlyhook() {
-    if [[ -n "${ip}" && -n "${miso_nbd_srv}" ]]; then
-        # Module autoloading like with loop devices does not work, doing manually...
-        modprobe nbd 2> /dev/null
-    fi
-}
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${miso_nbd_srv}" ]]; then
-
-        miso_nbd_srv=$(eval echo ${miso_nbd_srv})
-        [[ -z "${miso_nbd_name}" ]] && miso_nbd_name="miso"
-
-        mount_handler="miso_pxe_nbd_mount_handler"
-    fi
-}
-
-miso_pxe_nbd_mount_handler () {
-    newroot="${1}"
-
-    msg ":: Waiting for boot device..."
-    while ! poll_device /dev/nbd0 30; do
-        echo "ERROR: boot device didn't show up after 30 seconds..."
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    done
-
-    msg ":: Setup NBD from ${miso_nbd_srv} at /dev/nbd0"
-    if [[ "${copytoram}" != "n" ]]; then
-        nbd-client ${miso_nbd_srv} -N ${miso_nbd_name} /dev/nbd0
-        copytoram="y"
-    else
-        nbd-client ${miso_nbd_srv} -N ${miso_nbd_name} -persist /dev/nbd0
-    fi
-
-    misodevice=/dev/nbd0
-
-    miso_mount_handler ${newroot}
-
-    if [[ "${copytoram}" == "y" ]]; then
-        msg ":: Disconnect NBD from ${miso_nbd_srv} at /dev/nbd0"
-        nbd-client -d /dev/nbd0
-    fi
-}

initcpio/hooks/miso_pxe_nfs

@@ -1,30 +0,0 @@
-# vim: set ft=sh:
-
-run_hook() {
-    if [[ -n "${ip}" && -n "${miso_nfs_srv}" ]]; then
-
-        miso_nfs_srv=$(eval echo ${miso_nfs_srv})
-        [[ -n "${miso_nfs_opt}" ]] && miso_nfs_opt="-o ${miso_nfs_opt}"
-
-        mount_handler="miso_nfs_mount_handler"
-    fi
-}
-
-miso_nfs_mount_handler() {
-    newroot="${1}"
-    mkdir -p "/run/miso/bootmnt"
-    msg ":: Mounting '${miso_nfs_srv}'"
-    # Do not put "${miso_nfs_opt}" nfsmount fails!
-    if ! nfsmount ${miso_nfs_opt} "${miso_nfs_srv}" "/run/miso/bootmnt"; then
-        echo "ERROR: Mounting '${miso_nfs_srv}'"
-        echo "   Falling back to interactive prompt"
-        echo "   You can try to fix the problem manually, log out when you are finished"
-        launch_interactive_shell
-    fi
-
-    if [[ "${copytoram}" != "n" ]]; then
-        copytoram="y"
-    fi
-
-    miso_mount_handler ${newroot}
-}

initcpio/hooks/miso_shutdown

@@ -1,6 +0,0 @@
-run_cleanuphook() {
-    rm -rf /usr/lib/modules
-    cp -ax / /run/initramfs
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "cdrom"
-    add_module "loop"
-    add_module "dm-snapshot"
-    add_module "overlay"
-
-    add_runscript
-
-    add_binary /usr/lib/udev/cdrom_id
-    add_binary blockdev
-    add_binary dmsetup
-    add_binary losetup
-    add_binary mountpoint
-    add_binary truncate
-    add_binary gpg
-    add_binary grep
-
-    add_file /usr/lib/udev/rules.d/60-cdrom_id.rules
-    add_file /usr/lib/udev/rules.d/10-dm.rules
-    add_file /usr/lib/udev/rules.d/95-dm-notify.rules
-    add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    if [[ $MISO_GNUPG_FD ]]; then
-        mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$MISO_GNUPG_FD
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_kms

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "radeon"
-    add_module "nouveau"
-    add_module "i915"
-    add_module "via-agp"
-    add_module "sis-agp"
-    add_module "intel-agp"
-
-    if [[ $(uname -m) == i686 ]]; then
-        add_module "amd64-agp"
-        add_module "ati-agp"
-        add_module "sworks-agp"
-        add_module "ali-agp"
-        add_module "amd-k7-agp"
-        add_module "nvidia-agp"
-        add_module "efficeon-agp"
-    fi
-}
-
-help() {
-    cat << HELPEOF
-Adds all common KMS drivers to the initramfs image.
-HELPEOF
-}

initcpio/install/miso_loop_mnt

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via loop device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_common

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/ipconfig /bin/ipconfig
-
-    # Add hosts support files+dns
-    add_symlink /usr/lib/libnss_files.so.2 $(readlink /usr/lib/libnss_files.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_files.so.2)
-    add_symlink /usr/lib/libnss_dns.so.2 $(readlink /usr/lib/libnss_dns.so.2)
-    add_binary $(readlink -f /usr/lib/libnss_dns.so.2)
-
-    add_dir /etc
-    echo "hosts: files dns" > $BUILDROOT/etc/nsswitch.conf
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_http

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_runscript
-
-    add_binary curl
-
-    add_file $(readlink -f /etc/ssl/certs/ca-certificates.crt) /etc/ssl/certs/ca-certificates.crt
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and HTTP.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_nbd

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nbd"
-
-    add_runscript
-
-    add_binary nbd-client
-}
-
-help() {
-cat<<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NBD.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_pxe_nfs

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module "nfs"
-
-    add_runscript
-
-    add_binary /usr/lib/initcpio/nfsmount /bin/nfsmount
-}
-
-help() {
-    cat <<HELPEOF
-  This hook loads the necessary modules for boot via PXE and NFS.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/install/miso_shutdown

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary cp
-
-    add_runscript
-
-    add_file /etc/initcpio/miso_shutdown /shutdown
-}
-
-help() {
-    cat <<HELPEOF
-This hook will create a shutdown initramfs in /run/initramfs
-that we can pivot to on shutdown in order to unmount / and
-and others mount points, dm-snapshot devices and loopback devices.
-Mostly usefull for dm-snapshot persistent.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

initcpio/script/miso_shutdown

@@ -1,38 +0,0 @@
-#!/bin/ash
-
-# /oldroot depends on things inside /oldroot/run/miso...
-mkdir /oldrun
-mount -n --move /oldroot/run /oldrun
-
-# Unmount all mounts now.
-#umount $(mount | awk '$3 ~/^\/oldroot/ {print $3}' | sort -r)
-umount $(mount | awk '$3 ~/^\/oldroot/ {if($3 != "/run/miso/bootmnt") print $3}' | sort -r)
-
-# Remove all dm-snapshot devices.
-dmsetup remove_all
-
-# Remove all loopback devices.
-for _lup in $(grep ^/dev/loop /oldrun/miso/used_block_devices | tac); do
-    if ! losetup -d ${_lup} 2> /dev/null; then
-        umount -d ${_lup}
-    fi
-done
-
-# Unmount the space used to store *.cow.
-umount /oldrun/miso/cowspace
-
-# Unmount boot device if needed (no copytoram=y used)
-if [[ ! -d /oldrun/miso/copytoram ]]; then
-    if [[ -d /oldrun/miso/img_dev ]]; then
-        umount /oldrun/miso/img_dev
-    else
-        umount /oldrun/miso/bootmnt
-    fi
-fi
-
-# reboot / poweroff / halt, depending on the argument passed by init
-# if something invalid is passed, we halt
-case "$1" in
-  reboot|poweroff|halt) "$1" -f ;;
-  *) halt -f;;
-esac

lib/util-chroot.sh

@@ -23,6 +23,9 @@ create_min_fs(){
     mkdir -m 0755 -p $1/var/{cache/pacman/pkg,lib/pacman,log} $1/{dev,etc}
     mkdir -m 1777 -p $1/{tmp,run}
     mkdir -m 0555 -p $1/{sys,proc}
+    if [[ ! -f $1/etc/machine-id ]];then
+        touch $1/etc/machine-id
+    fi
 }
 
 is_btrfs() {
@@ -50,9 +53,8 @@ default_locale(){
         if [[ ! -f "$mnt/etc/locale.gen.bak" ]];then
             info "Setting locale ..."
             mv "$mnt/etc/locale.gen" "$mnt/etc/locale.gen.bak"
-            printf '%s.UTF-8 UTF-8\n' en_US > "$mnt/etc/locale.gen"
+            printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$mnt/etc/locale.gen"
-            printf 'LANG=%s.UTF-8\n' en_US > "$mnt/etc/locale.conf"
+            echo 'LANG=en_US.UTF-8.UTF-8' > "$mnt/etc/locale.conf"
-            printf 'LC_MESSAGES=C\n' >> "$mnt/etc/locale.conf"
         fi
     elif [[ $action == "reset" ]];then
         if [[ -f "$mnt/etc/locale.gen.bak" ]];then
@@ -69,51 +71,19 @@ default_mirror(){
     echo "Server = $mirror" > $mnt/etc/pacman.d/mirrorlist
 }
 
-create_chroot(){
-    local timer=$(get_timer)
-    setarch "${target_arch}" \
-        mkchroot "$@"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-delete_chroot() {
-    local copydir=$1
-    local copy=${1:-$2}
-
-    stat_busy "Removing chroot copy [%s]" "$copy"
-    if is_btrfs "$chrootdir" && ! mountpoint -q "$copydir"; then
-        subvolume_delete_recursive "$copydir" ||
-            die "Unable to delete subvolume %s" "$copydir"
-    else
-        # avoid change of filesystem in case of an umount failure
-        rm --recursive --force --one-file-system "$copydir" ||
-            die "Unable to delete %s" "$copydir"
-    fi
-
-    # remove lock file
-    rm -f "$copydir.lock"
-    stat_done
-}
-
 # $1: chroot
-# kill_chroot_process(){
+kill_chroot_process(){
-#     # enable to have more debug info
+    local prefix="$1" flink pid name
-#     #msg "machine-id (etc): $(cat $1/etc/machine-id)"
+    for root_dir in /proc/*/root; do
-#     #[[ -e $1/var/lib/dbus/machine-id ]] && msg "machine-id (lib): $(cat $1/var/lib/dbus/machine-id)"
+        flink=$(readlink $root_dir)
-#     #msg "running processes: "
+        if [ "x$flink" != "x" ]; then
-#     #lsof | grep $1
+            if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
-#
+                # this process is in the chroot...
-#     local prefix="$1" flink pid name
+                pid=$(basename $(dirname "$root_dir"))
-#     for root_dir in /proc/*/root; do
+                name=$(ps -p $pid -o comm=)
-#         flink=$(readlink $root_dir)
+                info "Killing chroot process: %s (%s)" "$name" "$pid"
-#         if [ "x$flink" != "x" ]; then
+                kill -9 "$pid"
-#             if [ "x${flink:0:${#prefix}}" = "x$prefix" ]; then
+            fi
-#                 # this process is in the chroot...
+        fi
-#                 pid=$(basename $(dirname "$root_dir"))
+    done
-#                 name=$(ps -p $pid -o comm=)
+}
-#                 info "Killing chroot process: %s (%s)" "$name" "$pid"
-#                 kill -9 "$pid"
-#             fi
-#         fi
-#     done
-# }

lib/util-fstab.sh

@@ -13,6 +13,7 @@ declare -A pseudofs_types=([anon_inodefs]=1
                         [bdev]=1
                         [binfmt_misc]=1
                         [cgroup]=1
+                        [cgroup2]=1
                         [configfs]=1
                         [cpuset]=1
                         [debugfs]=1
@@ -72,7 +73,7 @@ valid_number_of_base() {
 mangle() {
     local i= chr= out=
 
-    unset {a..f} {A..F}
+    local {a..f}= {A..F}=
 
     for (( i = 0; i < ${#1}; i++ )); do
         chr=${1:i:1}
@@ -91,7 +92,7 @@ mangle() {
 unmangle() {
     local i= chr= out= len=$(( ${#1} - 4 ))
 
-    unset {a..f} {A..F}
+    local {a..f}= {A..F}=
 
     for (( i = 0; i < len; i++ )); do
         chr=${1:i:1}

lib/util-iso-chroot.sh

@@ -1,136 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-add_svc_rc(){
-    local mnt="$1" name="$2" rlvl="$3"
-    if [[ -f $mnt/etc/init.d/$name ]];then
-        msg2 "Setting %s ..." "$name"
-        chroot $mnt rc-update add $name $rlvl &>/dev/null
-    fi
-}
-
-set_xdm(){
-    if [[ -f $1/etc/conf.d/xdm ]];then
-        local conf='DISPLAYMANAGER="'${displaymanager}'"'
-        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
-    fi
-}
-
-configure_hosts(){
-    sed -e "s|localhost.localdomain|localhost.localdomain ${hostname}|" -i $1/etc/hosts
-}
-
-configure_lsb(){
-    local conf=$1/etc/lsb-release
-    if [[ -e $conf ]] ; then
-        msg2 "Configuring lsb-release"
-        sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${dist_release}/" $conf
-#         sed -i -e "s/^.*DISTRIB_CODENAME.*/DISTRIB_CODENAME=${dist_codename}/" $conf
-    fi
-}
-
-configure_logind(){
-    local conf=$1/etc/$2/logind.conf
-    if [[ -e $conf ]];then
-        msg2 "Configuring logind ..."
-        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
-        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
-    fi
-}
-
-configure_services(){
-    local mnt="$1"
-    info "Configuring [%s]" "${initsys}"
-    case ${initsys} in
-        'openrc')
-            for svc in ${openrc_boot[@]}; do
-                add_svc_rc "$mnt" "$svc" "boot"
-            done
-            for svc in ${openrc_default[@]}; do
-                [[ $svc == "xdm" ]] && set_xdm "$mnt"
-                add_svc_rc "$mnt" "$svc" "default"
-            done
-            for svc in ${enable_live[@]}; do
-                add_svc_rc "$mnt" "$svc" "default"
-            done
-        ;;
-    esac
-    info "Done configuring [%s]" "${initsys}"
-}
-
-configure_system(){
-    local mnt="$1"
-    case ${initsys} in
-        'openrc')
-            configure_logind "$mnt" "elogind"
-        ;;
-    esac
-    echo ${hostname} > $mnt/etc/hostname
-}
-
-clean_iso_root(){
-    local dest="$1"
-    msg "Deleting isoroot [%s] ..." "${dest##*/}"
-    rm -rf --one-file-system "$dest"
-}
-
-clean_up_image(){
-    local path mnt="$1"
-    msg2 "Cleaning [%s]" "${mnt##*/}"
-
-    default_locale "reset" "$mnt"
-    path=$mnt/boot
-    if [[ -d "$path" ]]; then
-        find "$path" -name 'initramfs*.img' -delete &> /dev/null
-    fi
-    path=$mnt/var/lib/pacman/sync
-    if [[ -d $path ]];then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/cache/pacman/pkg
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/log
-    if [[ -d $path ]]; then
-        find "$path" -type f -delete &> /dev/null
-    fi
-    path=$mnt/var/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-    path=$mnt/tmp
-    if [[ -d $path ]];then
-        find "$path" -mindepth 1 -delete &> /dev/null
-    fi
-
-    if [[ ${mnt##*/} == 'livefs' ]];then
-        rm -rf "$mnt/etc/pacman.d/gnupg"
-    fi
-
-    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
-    file=$mnt/boot/grub/grub.cfg
-    if [[ -f "$file" ]]; then
-        rm $file
-    fi
-}
-
-chroot_clean(){
-    local dest="$1"
-    for root in "$dest"/*; do
-        [[ -d ${root} ]] || continue
-        local name=${root##*/}
-        delete_chroot "${root}" "$dest"
-    done
-    rm -rf --one-file-system "$dest"
-}
-

lib/util-iso-grub.sh

@@ -19,7 +19,7 @@ prepare_initcpio(){
 
 prepare_initramfs(){
     local mnt="$1"
-    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${os_id}.conf
+    cp ${DATADIR}/mkinitcpio.conf $mnt/etc/mkinitcpio-${iso_name}.conf
     if [[ -n ${gpgkey} ]]; then
         user_run "gpg --export ${gpgkey} >${AT_USERCONFDIR}/gpgkey"
         exec 17<>${AT_USERCONFDIR}/gpgkey
@@ -27,7 +27,7 @@ prepare_initramfs(){
     local _kernel=$(cat $mnt/usr/lib/modules/*/version)
     ARTIX_GNUPG_FD=${gpgkey:+17} chroot-run $mnt \
         /usr/bin/mkinitcpio -k ${_kernel} \
-        -c /etc/mkinitcpio-${os_id}.conf \
+        -c /etc/mkinitcpio-${iso_name}.conf \
         -g /boot/initramfs.img
 
     if [[ -n ${gpgkey} ]]; then
@@ -46,6 +46,16 @@ prepare_boot_extras(){
     cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING
 }
 
+configure_grub(){
+    local conf="$1"
+
+    sed -e "s|@arch@|${target_arch}|g" \
+        -e "s|@iso_label@|${iso_label}|" \
+        -e "s|@iso_name@|${iso_name}|g" \
+        -e "s|@kernel_args@|${kernel_args}|g" \
+        -i $conf
+}
+
 prepare_grub(){
     local platform=i386-pc img='core.img' grub=$3/boot/grub efi=$3/efi/boot \
         lib=$1/usr/lib/grub prefix=/boot/grub theme=$2/usr/share/grub data=$1/usr/share/grub
@@ -83,7 +93,7 @@ prepare_grub(){
     grub-mkimage -d ${grub}/${platform} -o ${efi}/${img} -O ${platform} -p ${prefix} iso9660
 
     prepare_dir ${grub}/themes
-    cp -r ${theme}/themes/${os_id} ${grub}/themes/
+    cp -r ${theme}/themes/${iso_name} ${grub}/themes/
     cp ${data}/unicode.pf2 ${grub}
     cp -r ${theme}/{locales,tz} ${grub}
 

lib/util-iso-mount.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-track_img() {
-    info "mount: [%s]" "$2"
-    mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
-}
-
-mount_img() {
-    IMG_ACTIVE_MOUNTS=()
-    mkdir -p "$2"
-    track_img "$1" "$2"
-}
-
-umount_img() {
-    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
-        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
-        umount "${IMG_ACTIVE_MOUNTS[@]}"
-        unset IMG_ACTIVE_MOUNTS
-        rm -r "$1"
-    fi
-}
-
-track_fs() {
-    info "overlayfs mount: [%s]" "$5"
-    mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
-}
-
-mount_fs(){
-    FS_ACTIVE_MOUNTS=()
-    local lower= upper="$1" work="$2" pkglist="$3"
-    local fs=${upper##*/}
-    local rootfs="$work/rootfs" desktopfs="$work/desktopfs" livefs="$work/livefs"
-    mkdir -p "${mnt_dir}/work"
-    mkdir -p "$upper"
-    case $fs in
-        desktopfs) lower="$rootfs" ;;
-        livefs)
-            lower="$rootfs"
-            [[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
-        ;;
-        bootfs)
-            lower="$livefs":"$rootfs"
-            [[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
-        ;;
-    esac
-    track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
-}
-
-umount_fs(){
-    if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
-        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
-        umount "${FS_ACTIVE_MOUNTS[@]}"
-        unset FS_ACTIVE_MOUNTS
-        rm -rf "${mnt_dir}/work"
-    fi
-}

lib/util-iso-profile.sh

@@ -8,31 +8,29 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-write_repo_conf(){
-    local repos=$(find $USER_HOME -type f -name "repo_info")
-    local path name
-    [[ -z ${repos[@]} ]] && run_dir=${DATADIR}/iso-profiles && return 1
-    for r in ${repos[@]}; do
-        path=${r%/repo_info}
-        name=${path##*/}
-        echo "run_dir=$path" > ${AT_USERCONFDIR}/$name.conf
-    done
-}
-
-load_run_dir(){
-    local gitrepo='iso-profiles'
-    [[ -f ${AT_USERCONFDIR}/$gitrepo.conf ]] || write_repo_conf
-    [[ -r ${AT_USERCONFDIR}/$gitrepo.conf ]] && source ${AT_USERCONFDIR}/$gitrepo.conf
-    return 0
-}
-
 load_profile(){
-    local profdir="$1"
+    local prof="$1"
-    local profile_conf="$profdir/profile.conf"
+    local profdir="${DATADIR}/iso-profiles/$prof"
+    [[ "$prof" != 'base' ]] && profdir=${workspace_dir}/iso-profiles/$prof
 
-    [[ -f ${profile_conf} ]] || return 1
+    root_list="${DATADIR}/iso-profiles/base/Packages-Root"
+    [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
 
-    [[ -r ${profile_conf} ]] && source ${profile_conf}
+    root_overlay="${DATADIR}/iso-profiles/base/root-overlay"
+    [[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
+
+    [[ -f "$profdir/Packages-Desktop" ]] && desktop_list="$profdir/Packages-Desktop"
+    [[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
+
+    live_list="${DATADIR}/iso-profiles/base/Packages-Live"
+    [[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
+
+    live_overlay="${DATADIR}/iso-profiles/base/live-overlay"
+    [[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
+
+    [[ -f $profdir/profile.conf ]] || return 1
+
+    [[ -r $profdir/profile.conf ]] && source $profdir/profile.conf
 
     [[ -z ${displaymanager} ]] && displaymanager="none"
 
@@ -46,59 +44,24 @@ load_profile(){
     [[ -z ${password} ]] && password="artix"
 
     if [[ -z ${addgroups} ]];then
-        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users"
+        addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
     fi
 
-    if [[ -z ${openrc_boot[@]} ]];then
+    if [[ -z ${services[@]} ]];then
-        openrc_boot=('elogind')
+        services=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
     fi
 
-    if [[ -z ${openrc_default[@]} ]];then
+    [[ ${displaymanager} != "none" ]] && services+=('xdm')
-        openrc_default=('acpid' 'bluetooth' 'cronie' 'cupsd' 'dbus' 'syslog-ng' 'NetworkManager')
+    
+    if [[ -z ${services_live[@]} ]];then
+        services_live=('artix-live' 'pacman-init')
     fi
-
+    
-    [[ ${displaymanager} != "none" ]] && openrc_default+=('xdm')
+    [[ -z ${netgroups_url} ]] && netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
-
-    enable_live=('artix-live' 'pacman-init')
-
-    netgroups="https://raw.githubusercontent.com/artix-linux/netgroups/master"
-
-    root_list=${run_dir}/base/Packages-Root
-    [[ -f "$profdir/Packages-Root" ]] && root_list="$profdir/Packages-Root"
-
-    root_overlay="${run_dir}/base/root-overlay"
-    [[ -d "$profdir/root-overlay" ]] && root_overlay="$profdir/root-overlay"
-
-    [[ -f "$profdir/Packages-Desktop" ]] && desktop_list=$profdir/Packages-Desktop
-    [[ -d "$profdir/desktop-overlay" ]] && desktop_overlay="$profdir/desktop-overlay"
-
-    live_list="${run_dir}/base/Packages-Live"
-    [[ -f "$profdir/Packages-Live" ]] && live_list="$profdir/Packages-Live"
-
-    live_overlay="${run_dir}/base/live-overlay"
-    [[ -d "$profdir/live-overlay" ]] && live_overlay="$profdir/live-overlay"
 
     return 0
 }
 
-reset_profile(){
-    unset displaymanager
-    unset autologin
-    unset hostname
-    unset username
-    unset password
-    unset addgroups
-    unset openrc_boot
-    unset openrc_default
-    unset enable_live
-    unset root_list
-    unset desktop_list
-    unset live_list
-    unset root_overlay
-    unset desktop_overlay
-    unset live_overlay
-}
-
 write_live_session_conf(){
     local path=$1${SYSCONFDIR}
     [[ ! -d $path ]] && mkdir -p "$path"
@@ -119,9 +82,8 @@ write_live_session_conf(){
     echo "addgroups='${addgroups}'" >> ${conf}
 }
 
-# $1: file name
 load_pkgs(){
-    local pkglist="$1" arch="$2" init="$3" _kv="$4"
+    local pkglist="$1" init="$2" _kv="$3"
     info "Loading Packages: [%s] ..." "${pkglist##*/}"
 
     local _init="s|>$init||g"
@@ -131,13 +93,6 @@ load_pkgs(){
         'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
     esac
 
-    local _arch="s|>x86_64||g" _arch_rm="s|>i686.*||g"
-
-    if [[ "$arch" == 'i686' ]];then
-        _arch="s|>i686||g"
-        _arch_rm="s|>x86_64.*||g"
-    fi
-
     local _blacklist="s|>blacklist.*||g" \
         _kernel="s|KERNEL|$_kv|g" \
         _space="s| ||g" \
@@ -151,8 +106,6 @@ load_pkgs(){
             | sed "$_init" \
             | sed "$_init_rm1" \
             | sed "$_init_rm2" \
-            | sed "$_arch" \
-            | sed "$_arch_rm" \
             | sed "$_kernel" \
             | sed "$_clean"))
 }

lib/util-iso-publish.sh

@@ -9,10 +9,15 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+connect(){
+    local home="/home/frs/project/${project}"
+    echo "${account},${project}@frs.${file_host}:${home}"
+}
+
 gen_webseed(){
     local webseed seed="$1"
     for mirror in ${host_mirrors[@]};do
-        webseed=${webseed:-}${webseed:+,}"http://${mirror}.dl.${seed}"
+        webseed=${webseed:-}${webseed:+,}"https://${mirror}.dl.${seed}"
     done
     echo ${webseed}
 }
@@ -22,9 +27,10 @@ make_torrent(){
 
     if [[ -n $(find ${src_dir} -type f -name "*.iso") ]]; then
         for iso in $(ls ${src_dir}/*.iso);do
-            local seed=${host}/project/${project}/${target_dir}/${iso##*/}
+            local seed=${file_host}/project/${project}${target_dir}${iso##*/}
             local mktorrent_args=(-c "${torrent_meta}" -p -l ${piece_size} -a ${tracker_url} -w $(gen_webseed ${seed}))
             ${verbose} && mktorrent_args+=(-v)
+            info "mktorrent_args: %s" "${mktorrent_args[@]}"
             msg2 "Creating (%s) ..." "${iso##*/}.torrent"
             mktorrent ${mktorrent_args[*]} -o ${iso}.torrent ${iso}
         done
@@ -33,7 +39,7 @@ make_torrent(){
 
 prepare_transfer(){
     target_dir="/iso/${profile}/"
-    src_dir="${cache_dir_iso}/${profile}/"
+    src_dir="${iso_pool}/${profile}/"
     ${torrent} && make_torrent
 }
 

lib/util-iso-yaml.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+write_bootloader_conf(){
+    local conf="$1/bootloader.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo '---' > "$conf"
+    echo "efiBootLoader: \"grub\"" >> "$conf"
+    echo "kernel: \"/vmlinuz-$kernel-${target_arch}\"" >> "$conf"
+    echo "img: \"/initramfs-$kernel-${target_arch}.img\"" >> "$conf"
+    echo "fallback: \"/initramfs-$kernel-${target_arch}-fallback.img\"" >> "$conf"
+    echo 'timeout: "10"' >> "$conf"
+    echo "kernelLine: \", with ${kernel}\"" >> "$conf"
+    echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
+    echo 'grubInstall: "grub-install"' >> "$conf"
+    echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
+    echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
+    echo '#efiBootloaderId: "dirname"' >> "$conf"
+}
+
+write_servicescfg_conf(){
+    local conf="$1/servicescfg.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo '---' >  "$conf"
+    echo '' >> "$conf"
+    echo 'services:' >> "$conf"
+    echo '    enabled:' >> "$conf"
+    for s in ${services[@]};do
+        echo "      - name: $s" >> "$conf"
+        echo '        runlevel: default' >> "$conf"
+    done
+}
+
+write_initcpio_conf(){
+    local conf="$1/initcpio.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo "---" > "$conf"
+    echo "kernel: ${kernel}" >> "$conf"
+}
+
+write_users_conf(){
+    local conf="$1/users.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo "---" > "$conf"
+    echo "defaultGroups:" >> "$conf"
+    local IFS=','
+    for g in ${addgroups[@]};do
+        echo "    - $g" >> "$conf"
+    done
+    unset IFS
+    echo "autologinGroup:  autologin" >> "$conf"
+    echo "doAutologin:     false" >> "$conf"
+    echo "sudoersGroup:    wheel" >> "$conf"
+    echo "setRootPassword: true" >> "$conf"
+    echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
+    echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
+    echo "avatarFilePath:  ~/.face" >> "$conf"
+}
+
+write_netinstall_conf(){
+    local conf="$1/netinstall.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo "---" > "$conf"
+    echo "groupsUrl: ${netgroups}" >> "$conf"
+}
+
+write_unpack_conf(){
+    local conf="$1/unpackfs.conf"
+    msg2 "Writing %s ..." "${conf##*/}"
+    echo "---" > "$conf"
+    echo "unpack:" >> "$conf"
+    echo "    - source: \"/run/${iso_name}/bootmnt/${iso_name}/${target_arch}/rootfs.sfs\"" >> "$conf"
+    echo "      sourcefs: \"squashfs\"" >> "$conf"
+    echo "      destination: \"\"" >> "$conf"
+    if [[ -f "${desktop_list}" ]] ; then
+        echo "    - source: \"/run/${iso_name}/bootmnt/${iso_name}/${target_arch}/desktopfs.sfs\"" >> "$conf"
+        echo "      sourcefs: \"squashfs\"" >> "$conf"
+        echo "      destination: \"\"" >> "$conf"
+    fi
+}
+
+configure_calamares(){
+    local dest="$1" mods="$1/etc/calamares/modules"
+    if [[ -d $dest/etc/calamares/modules ]];then
+        info "Configuring [Calamares]"
+        write_netinstall_conf "$mods"
+        write_unpack_conf "$mods"
+        write_users_conf "$mods"
+        write_initcpio_conf "$mods"
+        case ${initsys} in
+            'openrc') write_servicescfg_conf "$mods" ;;
+        esac
+        write_bootloader_conf "$mods"
+        info "Done configuring [Calamares]"
+    fi
+}

lib/util-iso.sh

@@ -10,11 +10,64 @@
 # GNU General Public License for more details.
 
 import ${LIBDIR}/util-chroot.sh
-import ${LIBDIR}/util-iso-chroot.sh
 import ${LIBDIR}/util-iso-grub.sh
-import ${LIBDIR}/util-yaml.sh
+import ${LIBDIR}/util-iso-yaml.sh
-import ${LIBDIR}/util-iso-mount.sh
+import ${LIBDIR}/util-iso-profile.sh
-import ${LIBDIR}/util-profile.sh
+
+track_img() {
+    info "mount: [%s]" "$2"
+    mount "$@" && IMG_ACTIVE_MOUNTS=("$2" "${IMG_ACTIVE_MOUNTS[@]}")
+}
+
+mount_img() {
+    IMG_ACTIVE_MOUNTS=()
+    mkdir -p "$2"
+    track_img "$1" "$2"
+}
+
+umount_img() {
+    if [[ -n ${IMG_ACTIVE_MOUNTS[@]} ]];then
+        info "umount: [%s]" "${IMG_ACTIVE_MOUNTS[@]}"
+        umount "${IMG_ACTIVE_MOUNTS[@]}"
+        unset IMG_ACTIVE_MOUNTS
+        rm -r "$1"
+    fi
+}
+
+track_fs() {
+    info "overlayfs mount: [%s]" "$5"
+    mount "$@" && FS_ACTIVE_MOUNTS=("$5" "${FS_ACTIVE_MOUNTS[@]}")
+}
+
+mount_overlay(){
+    FS_ACTIVE_MOUNTS=()
+    local lower= upper="$1" work="$2" pkglist="$3"
+    local fs=${upper##*/}
+    local rootfs="$work/rootfs" desktopfs="$work/desktopfs" livefs="$work/livefs"
+    mkdir -p "${mnt_dir}/work"
+    mkdir -p "$upper"
+    case $fs in
+        desktopfs) lower="$rootfs" ;;
+        livefs)
+            lower="$rootfs"
+            [[ -f $pkglist ]] && lower="$desktopfs":"$rootfs"
+        ;;
+        bootfs)
+            lower="$livefs":"$rootfs"
+            [[ -f $pkglist ]] && lower="$livefs":"$desktopfs":"$rootfs"
+        ;;
+    esac
+    track_fs -t overlay overlay -olowerdir="$lower",upperdir="$upper",workdir="${mnt_dir}/work" "$upper"
+}
+
+umount_overlay(){
+    if [[ -n ${FS_ACTIVE_MOUNTS[@]} ]];then
+        info "overlayfs umount: [%s]" "${FS_ACTIVE_MOUNTS[@]}"
+        umount "${FS_ACTIVE_MOUNTS[@]}"
+        unset FS_ACTIVE_MOUNTS
+        rm -rf "${mnt_dir}/work"
+    fi
+}
 
 error_function() {
     if [[ -p $logpipe ]]; then
@@ -26,25 +79,22 @@ error_function() {
         error "A failure occurred in %s()." "$func"
         plain "Aborting..."
     fi
-    umount_fs
+    umount_overlay
     umount_img
     exit 2
 }
 
 # $1: function
 run_log(){
-    local func="$1"
+    local func="$1" log_dir='/var/log/artools'
     local logfile=${log_dir}/$(gen_iso_fn).$func.log
-#     local tmpfile=${tmp_dir}/$func.ansi.log
+    logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
-    logpipe=$(mktemp -u "${tmp_dir}/$func.pipe.XXXXXXXX")
     mkfifo "$logpipe"
     tee "$logfile" < "$logpipe" &
     local teepid=$!
     $func &> "$logpipe"
     wait $teepid
     rm "$logpipe"
-#     cat $tmpfile | perl -pe 's/\e\[?.*?[\@-~]//g' > $logfile
-#     rm "$tmpfile"
 }
 
 run_safe() {
@@ -68,11 +118,124 @@ run_safe() {
 trap_exit() {
     local sig=$1; shift
     error "$@"
-    umount_fs
+    umount_overlay
     trap -- "$sig"
     kill "-$sig" "$$"
 }
 
+prepare_traps(){
+    for sig in TERM HUP QUIT; do
+        trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
+    done
+    trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
+#     trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
+}
+
+add_svc_rc(){
+    local mnt="$1" name="$2" rlvl="$3"
+    if [[ -f $mnt/etc/init.d/$name ]];then
+        msg2 "Setting %s ..." "$name"
+        chroot $mnt rc-update add $name $rlvl &>/dev/null
+    fi
+}
+
+set_xdm(){
+    if [[ -f $1/etc/conf.d/xdm ]];then
+        local conf='DISPLAYMANAGER="'${displaymanager}'"'
+        sed -i -e "s|^.*DISPLAYMANAGER=.*|${conf}|" $1/etc/conf.d/xdm
+    fi
+}
+
+configure_hosts(){
+    sed -e "s|localhost.localdomain|localhost.localdomain ${hostname}|" -i $1/etc/hosts
+}
+
+configure_logind(){
+    local conf=$1/etc/$2/logind.conf
+    if [[ -e $conf ]];then
+        msg2 "Configuring logind ..."
+        sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
+        sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
+        sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
+    fi
+}
+
+configure_services(){
+    local mnt="$1"
+    info "Configuring [%s]" "${initsys}"
+    case ${initsys} in
+        'openrc')
+            for svc in ${services[@]}; do
+                [[ $svc == "xdm" ]] && set_xdm "$mnt"
+                add_svc_rc "$mnt" "$svc" "default"
+            done
+            for svc in ${services_live[@]}; do
+                add_svc_rc "$mnt" "$svc" "default"
+            done
+        ;;
+    esac
+    info "Done configuring [%s]" "${initsys}"
+}
+
+configure_system(){
+    local mnt="$1"
+    case ${initsys} in
+        'openrc')
+            configure_logind "$mnt" "elogind"
+        ;;
+    esac
+    echo ${hostname} > $mnt/etc/hostname
+}
+
+clean_iso_root(){
+    local dest="$1"
+    msg "Deleting isoroot [%s] ..." "${dest##*/}"
+    rm -rf --one-file-system "$dest"
+}
+
+clean_up_image(){
+    local path mnt="$1"
+    msg2 "Cleaning [%s]" "${mnt##*/}"
+
+    default_locale "reset" "$mnt"
+    path=$mnt/boot
+    if [[ -d "$path" ]]; then
+        find "$path" -name 'initramfs*.img' -delete &> /dev/null
+    fi
+    path=$mnt/var/lib/pacman/sync
+    if [[ -d $path ]];then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/cache/pacman/pkg
+    if [[ -d $path ]]; then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/log
+    if [[ -d $path ]]; then
+        find "$path" -type f -delete &> /dev/null
+    fi
+    path=$mnt/var/tmp
+    if [[ -d $path ]];then
+        find "$path" -mindepth 1 -delete &> /dev/null
+    fi
+    path=$mnt/tmp
+    if [[ -d $path ]];then
+        find "$path" -mindepth 1 -delete &> /dev/null
+    fi
+
+    if [[ ${mnt##*/} == 'livefs' ]];then
+        rm -rf "$mnt/etc/pacman.d/gnupg"
+    fi
+
+    find "$mnt" -name *.pacnew -name *.pacsave -name *.pacorig -delete
+    if [[ -f "$mnt/boot/grub/grub.cfg" ]]; then
+        rm $mnt/boot/grub/grub.cfg
+    fi
+    if [[ -f "$mnt/etc/machine-id" ]]; then
+        rm $mnt/etc/machine-id
+    fi
+}
+
 configure_live_image(){
     local fs="$1"
     msg "Configuring [livefs]"
@@ -96,9 +259,9 @@ make_sig () {
 
 make_checksum(){
     local idir="$1" file="$2"
-    msg2 "Creating md5sum ..."
+    msg2 "Creating sha512sum ..."
     cd $idir
-    md5sum $file.sfs > $file.md5
+    sha512sum $file.sfs > $file.sha512
     cd ${OLDPWD}
 }
 
@@ -109,15 +272,15 @@ make_sfs() {
         error "The path %s does not exist" "${src}"
         retrun 1
     fi
-    local timer=$(get_timer) dest=${iso_root}/${os_id}/${target_arch}
+    local timer=$(get_timer) dest=${iso_root}/${iso_name}/${target_arch}
     local name=${1##*/}
     local sfs="${dest}/${name}.sfs"
     mkdir -p ${dest}
     msg "Generating SquashFS image for %s" "${src}"
     if [[ -f "${sfs}" ]]; then
         local has_changed_dir=$(find ${src} -newer ${sfs})
-        msg2 "Possible changes for %s ..." "${src}"  >> ${tmp_dir}/buildiso.debug
+        msg2 "Possible changes for %s ..." "${src}"  >> /tmp/buildiso.debug
-        msg2 "%s" "${has_changed_dir}" >> ${tmp_dir}/buildiso.debug
+        msg2 "%s" "${has_changed_dir}" >> /tmp/buildiso.debug
         if [[ -n "${has_changed_dir}" ]]; then
             msg2 "SquashFS image %s is not up to date, rebuilding..." "${sfs}"
             rm "${sfs}"
@@ -179,7 +342,7 @@ assemble_iso(){
     xorriso -as mkisofs \
         --modification-date=${mod_date} \
         --protective-msdos-label \
-        -volid "${dist_branding}" \
+        -volid "${iso_label}" \
         -appid "$(get_osname) Live/Rescue CD" \
         -publisher "$(get_osname) <$(get_disturl)>" \
         -preparer "Prepared by artools/${0##*/}" \
@@ -193,14 +356,11 @@ assemble_iso(){
         -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info \
         -eltorito-alt-boot \
         -append_partition 2 0xef ${iso_root}/efi.img \
-        -e --interval:appended_partition_2:all:: \
+        -e --interval:appended_partition_2:all:: -iso_mbr_part_type 0x00 \
         -no-emul-boot \
         -iso-level 3 \
         -o ${iso_dir}/${iso_file} \
         ${iso_root}/
-
-#         arg to add with xorriso-1.4.7
-#         -iso_mbr_part_type 0x00
 }
 
 # Build ISO
@@ -226,9 +386,9 @@ make_iso() {
 
 gen_iso_fn(){
     local vars=() name
-    vars+=("${os_id}")
+    vars+=("${iso_name}")
     vars+=("${profile}")
-    vars+=("${dist_release}")
+    vars+=("${iso_version}")
     vars+=("${target_arch}")
     for n in ${vars[@]};do
         name=${name:-}${name:+-}${n}
@@ -236,6 +396,12 @@ gen_iso_fn(){
     echo $name
 }
 
+install_packages(){
+    local fs="$1"
+    setarch "${target_arch}" mkchroot \
+        "${mkchroot_args[@]}" "${fs}" "${packages[@]}"
+}
+
 copy_overlay(){
     local src="$1" dest="$2"
     if [[ -e "$src" ]];then
@@ -244,56 +410,53 @@ copy_overlay(){
     fi
 }
 
-# Base installation (rootfs)
+make_rootfs() {
-make_image_root() {
     if [[ ! -e ${work_dir}/rootfs.lock ]]; then
         msg "Prepare [Base installation] (rootfs)"
         local rootfs="${work_dir}/rootfs"
 
         prepare_dir "${rootfs}"
 
-        create_chroot "${mkchroot_args[@]}" "${rootfs}" "${packages[@]}"
+        install_packages "${rootfs}"
 
         copy_overlay "${root_overlay}" "${rootfs}"
 
-        configure_lsb "${rootfs}"
-
         clean_up_image "${rootfs}"
 
         msg "Done [Base installation] (rootfs)"
     fi
 }
 
-make_image_desktop() {
+make_desktopfs() {
     if [[ ! -e ${work_dir}/desktopfs.lock ]]; then
         msg "Prepare [Desktop installation] (desktopfs)"
         local desktopfs="${work_dir}/desktopfs"
 
         prepare_dir "${desktopfs}"
 
-        mount_fs "${desktopfs}" "${work_dir}"
+        mount_overlay "${desktopfs}" "${work_dir}"
 
-        create_chroot "${mkchroot_args[@]}" "${desktopfs}" "${packages[@]}"
+        install_packages "${desktopfs}"
 
         copy_overlay "${desktop_overlay}" "${desktopfs}"
 
-        umount_fs
+        umount_overlay
         clean_up_image "${desktopfs}"
 
         msg "Done [Desktop installation] (desktopfs)"
     fi
 }
 
-make_image_live() {
+make_livefs() {
     if [[ ! -e ${work_dir}/livefs.lock ]]; then
         msg "Prepare [Live installation] (livefs)"
         local livefs="${work_dir}/livefs"
 
         prepare_dir "${livefs}"
 
-        mount_fs "${livefs}" "${work_dir}" "${desktop_list}"
+        mount_overlay "${livefs}" "${work_dir}" "${desktop_list}"
 
-        create_chroot "${mkchroot_args[@]}" "${livefs}" "${packages[@]}"
+        install_packages "${livefs}"
 
         copy_overlay "${live_overlay}" "${livefs}"
 
@@ -301,7 +464,7 @@ make_image_live() {
 
         pacman -Qr "${livefs}" > ${iso_dir}/$(gen_iso_fn)-pkgs.txt
 
-        umount_fs
+        umount_overlay
 
         clean_up_image "${livefs}"
 
@@ -309,7 +472,7 @@ make_image_live() {
     fi
 }
 
-make_image_boot() {
+make_bootfs() {
     if [[ ! -e ${work_dir}/bootfs.lock ]]; then
         msg "Prepare [/iso/boot]"
         local boot="${iso_root}/boot"
@@ -320,7 +483,7 @@ make_image_boot() {
 
         local bootfs="${work_dir}/bootfs"
 
-        mount_fs "${bootfs}" "${work_dir}" "${desktop_list}"
+        mount_overlay "${bootfs}" "${work_dir}" "${desktop_list}"
 
         prepare_initcpio "${bootfs}"
         prepare_initramfs "${bootfs}"
@@ -328,7 +491,7 @@ make_image_boot() {
         cp ${bootfs}/boot/initramfs.img ${boot}/initramfs-${target_arch}.img
         prepare_boot_extras "${bootfs}" "${boot}"
 
-        umount_fs
+        umount_overlay
 
         rm -R ${bootfs}
         : > ${work_dir}/bootfs.lock
@@ -336,23 +499,6 @@ make_image_boot() {
     fi
 }
 
-configure_grub(){
-    local conf="$1"
-    local default_args="artixbasedir=${os_id} artixlabel=${dist_branding}" boot_args=('quiet')
-
-    sed -e "s|@DIST_NAME@|${dist_name}|g" \
-        -e "s|@ARCH@|${target_arch}|g" \
-        -e "s|@DEFAULT_ARGS@|${default_args}|g" \
-        -e "s|@BOOT_ARGS@|${boot_args[*]}|g" \
-        -e "s|@PROFILE@|${profile}|g" \
-        -i $conf
-}
-
-configure_grub_theme(){
-    local conf="$1"
-    sed -e "s|@DIST@|${os_id}|" -i "$conf"
-}
-
 make_grub(){
     if [[ ! -e ${work_dir}/grub.lock ]]; then
         msg "Prepare [/iso/boot/grub]"
@@ -360,7 +506,6 @@ make_grub(){
         prepare_grub "${work_dir}/rootfs" "${work_dir}/livefs" "${iso_root}"
 
         configure_grub "${iso_root}/boot/grub/kernels.cfg"
-        configure_grub_theme "${iso_root}/boot/grub/variable.cfg"
 
         : > ${work_dir}/grub.lock
         msg "Done [/iso/boot/grub]"
@@ -376,78 +521,18 @@ compress_images(){
 
 prepare_images(){
     local timer=$(get_timer)
-    load_pkgs "${root_list}" "${target_arch}" "${initsys}" "${kernel}"
+    load_pkgs "${root_list}" "${initsys}" "${kernel}"
-    run_safe "make_image_root"
+    run_safe "make_rootfs"
     if [[ -f "${desktop_list}" ]] ; then
-        load_pkgs "${desktop_list}" "${target_arch}" "${initsys}" "${kernel}"
+        load_pkgs "${desktop_list}" "${initsys}" "${kernel}"
-        run_safe "make_image_desktop"
+        run_safe "make_desktopfs"
     fi
     if [[ -f ${live_list} ]]; then
-        load_pkgs "${live_list}" "${target_arch}" "${initsys}" "${kernel}"
+        load_pkgs "${live_list}" "${initsys}" "${kernel}"
-        run_safe "make_image_live"
+        run_safe "make_livefs"
     fi
-    run_safe "make_image_boot"
+    run_safe "make_bootfs"
     run_safe "make_grub"
 
     show_elapsed_time "${FUNCNAME}" "${timer}"
 }
-
-check_requirements(){
-    [[ -f ${run_dir}/repo_info ]] || die "%s is not a valid iso profiles directory!" "${run_dir}"
-
-    for sig in TERM HUP QUIT; do
-        trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
-    done
-    trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
-    trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
-}
-
-prepare_build(){
-    timer_start=$(get_timer)
-    local profile_dir=${run_dir}/${profile}
-
-    load_profile "${profile_dir}"
-
-    local pac_arch='default' pacman_conf
-    [[ "${target_arch}" == 'x86_64' ]] && pac_arch='multilib'
-
-    pacman_conf="${DATADIR}/pacman-$pac_arch.conf"
-
-    iso_file=$(gen_iso_fn).iso
-
-    mkchroot_args+=(-C ${pacman_conf})
-    work_dir=${chroots_iso}/${profile}/${target_arch}
-
-    iso_dir="${cache_dir_iso}/${profile}"
-
-    iso_root=${chroots_iso}/${profile}/iso
-    mnt_dir=${chroots_iso}/${profile}/mnt
-    prepare_dir "${mnt_dir}"
-    prepare_dir "${iso_dir}"
-}
-
-build(){
-    prepare_build
-    msg "Start building [%s]" "${profile}"
-    if ${clean_first};then
-        chroot_clean "${chroots_iso}/${profile}/${target_arch}"
-        clean_iso_root "${iso_root}"
-    fi
-
-    if ${iso_only}; then
-        [[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
-        compress_images
-        exit 1
-    fi
-    if ${images_only}; then
-        prepare_images
-        warning "Continue compress: buildiso -p %s -zc ..." "${profile}"
-        exit 1
-    else
-        prepare_images
-        compress_images
-    fi
-    reset_profile
-    msg "Finished building [%s]" "${profile}"
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}

lib/util-msg.sh

@@ -8,61 +8,22 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-export LC_MESSAGES=C
+# export LC_MESSAGES=C
 export LANG=C
 
-declare ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
+source /usr/share/makepkg/util.sh
 
 if [[ -t 2 ]]; then
-    # prefer terminal safe colored and bold text when tput is supported
+    colorize
-    if tput setaf 0 &>/dev/null; then
+else
-        ALL_OFF="$(tput sgr0)"
+    declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
-        BOLD="$(tput bold)"
-        RED="${BOLD}$(tput setaf 1)"
-        GREEN="${BOLD}$(tput setaf 2)"
-        YELLOW="${BOLD}$(tput setaf 3)"
-        BLUE="${BOLD}$(tput setaf 4)"
-    else
-        ALL_OFF="\e[0m"
-        BOLD="\e[1m"
-        RED="${BOLD}\e[31m"
-        GREEN="${BOLD}\e[32m"
-        YELLOW="${BOLD}\e[33m"
-        BLUE="${BOLD}\e[34m"
-    fi
 fi
-readonly ALL_OFF BOLD BLUE GREEN RED YELLOW
-
-plain() {
-    local mesg=$1; shift
-    printf "${BOLD}    ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg() {
-    local mesg=$1; shift
-    printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-msg2() {
-    local mesg=$1; shift
-    printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
 
 info() {
     local mesg=$1; shift
     printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
-warning() {
-    local mesg=$1; shift
-    printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
-error() {
-    local mesg=$1; shift
-    printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-}
-
 stat_busy() {
     local mesg=$1; shift
     printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
@@ -115,6 +76,31 @@ die() {
     cleanup 255
 }
 
+msg_table_header(){
+    local mesg=$1; shift
+    printf "${BLUE} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_downgrade(){
+    local mesg=$1; shift
+    printf "${YELLOW} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_notify(){
+    local mesg=$1; shift
+    printf "${GREEN} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row(){
+    local mesg=$1; shift
+    printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+msg_row_upgrade(){
+    local mesg=$1; shift
+    printf "${RED}${RED} ${mesg} ${ALL_OFF}\n" "$@" >&2
+}
+
 import(){
     if [[ -r "$1" ]];then
         source "$1"

lib/util-pkg-chroot.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-load_compiler_settings(){
-    local arch="$1" conf
-    conf=${make_conf_dir}/$arch.conf
-
-    [[ -f $conf ]] || return 1
-
-    info "Loading compiler settings: %s" "$arch"
-    source $conf
-
-    return 0
-}
-
-get_makepkg_conf(){
-
-    local arch="$1"
-    local conf="${tmp_dir}/makepkg-${arch}.conf"
-
-    if [[ -f $AT_USERCONFDIR/makepkg.conf ]];then
-        cp "$AT_USERCONFDIR/makepkg.conf" "$conf"
-    else
-        cp "${DATADIR}/makepkg.conf" "$conf"
-    fi
-
-    load_compiler_settings "${arch}"
-
-    sed -i "$conf" \
-        -e "s|@CARCH[@]|$carch|g" \
-        -e "s|@CHOST[@]|$chost|g" \
-        -e "s|@CFLAGS[@]|$cflags|g"
-
-    echo "$conf"
-}
-
-check_build(){
-    local bdir="$1"
-    find_pkg "${bdir}"
-    [[ ! -f ${bdir}/PKGBUILD ]] && die "Directory must contain a PKGBUILD!"
-}
-
-find_pkg(){
-    local bdir="$1"
-    local result=$(find . -type d -name "${bdir}")
-    [[ -z $result ]] && die "%s is not a valid package!" "${bdir}"
-}
-
-sign_pkg(){
-    local pkg="$1"
-    [[ -f ${pkg_dir}/${pkg}.sig ]] && rm ${pkg_dir}/${pkg}.sig
-    user_run "signfile ${pkg_dir}/${pkg}"
-}
-
-move_to_cache(){
-    local src="$1"
-    [[ -n $PKGDEST ]] && src="$PKGDEST/$src"
-    [[ ! -f $src ]] && die
-    msg2 "Moving [%s] -> [%s]" "${src##*/}" "${pkg_dir}"
-    mv $src ${pkg_dir}/
-    user_own "${pkg_dir}" -R
-    ${sign} && sign_pkg "${src##*/}"
-#     [[ -n $PKGDEST ]] && rm "$src"
-    user_own "${pkg_dir}" -R
-}
-
-post_build(){
-    source PKGBUILD
-    local ext='pkg.tar.xz' tarch ver src
-    for pkg in ${pkgname[@]};do
-        case $arch in
-            any) tarch='any' ;;
-            *) tarch=${target_arch}
-        esac
-        local ver=$(get_full_version "$pkg") src
-        src=$pkg-$ver-$tarch.$ext
-        move_to_cache "$src"
-        if ${repo_add};then
-            deploypkg "${deploypkg_args[@]}" -p "$src"
-            user_own "${repos_local}/${repository}" -R
-        fi
-    done
-}
-
-build_pkg(){
-    mkchrootpkg "${mkchrootpkg_args[@]}" || die
-    post_build
-}
-
-build(){
-    local pkg="$1"
-    check_build "${pkg}"
-    msg "Start building [%s]" "${pkg}"
-    cd ${pkg}
-        build_pkg
-    cd ..
-    msg "Finished building [%s]" "${pkg}"
-    show_elapsed_time "${FUNCNAME}" "${timer_start}"
-}
-

lib/util-pkg-publish.sh

@@ -1,75 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-repo_update(){
-    local repo="$1" arch="$2" pkg="$3" action="$4" copy="$5"
-    if [[ $action == "add" ]];then
-        if [[ -f ${repos_local}/$repo/os/$arch/$pkg \
-            && -f ${repos_local}/$repo/os/$arch/$pkg.sig ]];then
-            rm ${repos_local}/$repo/os/$arch/$pkg
-            rm ${repos_local}/$repo/os/$arch/$pkg.sig
-        fi
-        local cmd='ln -s'
-        $copy && cmd='cp'
-        $cmd ${cache_dir_pkg}/$arch/$repo/$pkg{,.sig} ${repos_local}/$repo/os/$arch/
-    fi
-    local dest=${repos_local}/$repo/os/$arch/$pkg
-    [[ $action == "remove" ]] && dest=$pkg
-    repo-$action -R ${repos_local}/$repo/os/$arch/$repo.db.tar.xz $dest
-}
-
-update_lock(){
-    local repo="$1"
-    rsync "${rsync_args[@]}" --exclude='os' "${repos_local}/$repo/" "$(connect)${repos_remote}/$repo/"
-}
-
-is_locked(){
-    local repo="$1" url="https://${host}/projects/${project}/files/repos"
-    if wget --spider -v $url/$repo/$repo.lock &>/dev/null;then
-        return 0
-    else
-        return 1
-    fi
-}
-
-repo_lock(){
-    local repo="$1"
-    if [[ ! -f ${repos_local}/$repo/$repo.lock ]];then
-        warning "Locking %s" "$repo"
-        touch ${repos_local}/$repo/$repo.lock
-        update_lock "$repo"
-    fi
-}
-
-repo_unlock(){
-    local repo="$1"
-    if [[ -f ${repos_local}/$repo/$repo.lock ]];then
-        warning "Unlocking %s" "$repo"
-        rm ${repos_local}/$repo/$repo.lock
-        update_lock "$repo"
-    fi
-}
-
-repo_download(){
-    local repo="$1"
-    if is_locked "$repo"; then
-        die "The '%s' repository is locked" "$repo"
-    else
-        rsync "${rsync_args[@]}" "$(connect)${repos_remote}/$repo/" "${repos_local}/$repo/"
-    fi
-}
-
-repo_upload(){
-    local repo="$1"
-    repo_lock "$repo"
-    rsync "${rsync_args[@]}" "${repos_local}/$repo/" "$(connect)${repos_remote}/$repo/"
-    repo_unlock "$repo"
-}

lib/util-pkg-tree.sh

@@ -1,122 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-get_local_head(){
-    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
-}
-
-get_remote_head(){
-    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
-}
-
-is_dirty() {
-    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
-    return 0
-}
-
-sync_tree(){
-    local branch="master" repo="$1"
-    local local_head=$(get_local_head "$branch")
-    local remote_head=$(get_remote_head "$branch")
-    local timer=$(get_timer)
-    msg "Checking [%s] ..." "$repo"
-    msg2 "local: %s" "${local_head}"
-    msg2 "remote: %s" "${remote_head}"
-    if [[ "${local_head}" == "${remote_head}" ]]; then
-        info "nothing to do"
-    else
-        info "needs sync"
-        git pull origin $branch
-    fi
-    msg "Done [%s]" "$repo"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-clone_tree(){
-    local timer=$(get_timer) repo="$1" host_tree="$2"
-    msg "Preparing [%s] ..." "$repo"
-    info "clone"
-    git clone $host_tree.git
-    msg "Done [%s]" "$repo"
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}
-
-sync_tree_artix(){
-    cd ${tree_dir_artix}
-        for repo in ${repo_tree_import[@]};do
-            if [[ -d ${repo} ]];then
-                cd ${repo}
-                    $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
-                    sync_tree "${repo}"
-                cd ..
-            else
-                clone_tree "${repo}" "${host_tree_artix}/${repo}"
-            fi
-        done
-    cd ..
-}
-
-sync_tree_arch(){
-    cd ${tree_dir_arch}
-        for repo in ${repo_tree_arch[@]};do
-            if [[ -d ${repo} ]];then
-                cd ${repo}
-                    sync_tree "${repo}"
-                cd ..
-            else
-                clone_tree "${repo}" "${host_tree_arch}/${repo}"
-            fi
-        done
-    cd ..
-}
-
-read_import_list(){
-    local name="$1"
-    local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g"
-    import_list=$(sed "$_com_rm" "${list_dir_import}/$name.list" | sed "$_space" | sed "$_clean")
-}
-
-get_pkgver(){
-    source PKGBUILD
-    echo $pkgver-$pkgrel
-}
-
-is_untracked(){
-    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
-    return 0
-}
-
-import_from_arch(){
-    local timer=$(get_timer)
-    for repo in ${repo_tree_import[@]};do
-        read_import_list "$repo"
-        if [[ -n ${import_list[@]} ]];then
-            cd ${tree_dir_artix}/$repo
-#             git checkout master &> /dev/null
-            $(is_dirty) && die "[%s] has uncommited changes!" "${repo}"
-            local arch_dir=packages
-            [[ $repo == "galaxy-arch" ]] && arch_dir=community
-            msg "Import into [%s]" "$repo"
-            for pkg in ${import_list[@]};do
-                rsync "${rsync_args[@]}" ${tree_dir_arch}/$arch_dir/$pkg/trunk/ ${tree_dir_artix}/$repo/$pkg/
-                if $(is_dirty) || $(is_untracked); then
-                    git add $pkg
-                    cd $pkg
-                        local ver=$(get_pkgver)
-                        msg2 "Archlinux import: [%s]" "$pkg-$ver"
-                        git commit -m "Archlinux import: $pkg-$ver"
-                    cd ..
-                fi
-            done
-        fi
-    done
-    show_elapsed_time "${FUNCNAME}" "${timer}"
-}

lib/util-pkg.sh

@@ -9,13 +9,209 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-in_array() {
+get_local_head(){
-    local needle=$1; shift
+    echo $(git log --pretty=%H ...refs/heads/$1^ | head -n 1)
-    local item
+}
-    for item in "$@"; do
+
-        [[ $item = $needle ]] && return 0 # Found
+get_remote_head(){
-    done
+    echo $(git ls-remote origin -h refs/heads/$1 | cut -f1)
-    return 1 # Not Found
+}
+
+is_dirty() {
+    [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] || return 1
+    return 0
+}
+
+is_untracked(){
+    [[ $(git ls-files --others --exclude-standard)  != "" ]] || return 1
+    return 0
+}
+
+patch_pkg(){
+    local pkg="$1" repo="$2"
+    case $pkg in
+        'glibc')
+            sed -e 's|{locale,systemd/system,tmpfiles.d}|{locale,tmpfiles.d}|' \
+                -e '/nscd.service/d' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'tp_smapi'|'acpi_call'|'r8168'|'bbswitch')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+        ;;
+        'nvidia')
+            sed -e 's|-ARCH|-ARTIX|g'  -e 's|for Arch kernel|for Artix kernel|g' \
+                -e 's|for LTS Arch kernel|for LTS Artix kernel|g' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+        'linux')
+            sed -e 's|-ARCH|-ARTIX|g' -i $pkg/trunk/PKGBUILD
+            sed -e 's|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION="-ARTIX"|' \
+                -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
+                -i $pkg/trunk/config
+            cd $pkg/trunk
+                updpkgsums
+            cd ../..
+
+        ;;
+        'licenses')
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' -i $pkg/trunk/PKGBUILD
+        ;;
+        'bash')
+            sed -e 's|system.bash_logout)|system.bash_logout artix.bashrc)|' \
+            -e "s|etc/bash.|etc/bash/|g" \
+            -e 's|"$pkgdir/etc/skel/.bash_logout"|"$pkgdir/etc/skel/.bash_logout"\n  install -Dm644 artix.bashrc $pkgdir/etc/bash/bashrc.d/artix.bashrc|' \
+            -i $pkg/trunk/PKGBUILD
+
+
+            cd $pkg/trunk
+                patch -Np 1 -i ${DATADIR}/patches/artix-bash.patch
+                updpkgsums
+            cd ../..
+        ;;
+        gstreamer|gst-plugins-*)
+            sed -e 's|https://www.archlinux.org/|https://www.artixlinux.org/|' \
+                -e 's|(Arch Linux)|(Artix Linux)|' \
+                -i $pkg/trunk/PKGBUILD
+        ;;
+    esac
+}
+
+find_tree(){
+    local tree="$1" pkg="$2"
+    local result=$(find $tree -mindepth 2 -maxdepth 2 -type d -name "$pkg")
+    result=${result%/*}
+    echo ${result##*/}
+}
+
+clone_tree(){
+    local timer=$(get_timer) host_tree="$1"
+    git clone $host_tree.git
+    show_elapsed_time "${FUNCNAME}" "${timer}"
+}
+
+pull_tree(){
+    local branch="master"
+    local local_head=$(get_local_head "$branch")
+    local remote_head=$(get_remote_head "$branch")
+    if [[ "${local_head}" == "${remote_head}" ]]; then
+        msg2 "remote changes: no"
+    else
+        msg2 "remote changes: yes"
+        git pull origin "$branch"
+    fi
+}
+
+push_tree(){
+    local branch="master"
+    git push origin "$branch"
+}
+
+get_import_path(){
+    local tree="$1" import_path=
+    case $tree in
+        packages) import_path=${tree_dir_arch}/packages ;;
+        packages-galaxy) import_path=${tree_dir_arch}/community ;;
+    esac
+    echo $import_path
+}
+
+is_valid_repo(){
+    local src="$1"
+    case $src in
+        core|extra|community|multilib|testing|staging|community-testing|community-staging|multilib-testing|multilib-staging|trunk) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
+find_repo(){
+    local pkg="$1" incl="$2" repo=
+
+    if [[ -f $pkg/repos/core-x86_64/PKGBUILD ]];then
+        repo=core-x86_64
+    elif [[ -f $pkg/repos/core-any/PKGBUILD ]];then
+        repo=core-any
+    fi
+
+    if [[ -f $pkg/repos/extra-x86_64/PKGBUILD ]];then
+        repo=extra-x86_64
+    elif [[ -f $pkg/repos/extra-any/PKGBUILD ]];then
+        repo=extra-any
+    fi
+
+    if [[ -f $pkg/repos/testing-x86_64/PKGBUILD ]];then
+        repo=testing-x86_64
+    elif [[ -f $pkg/repos/testing-any/PKGBUILD ]];then
+        repo=testing-any
+    fi
+
+    if [[ -f $pkg/repos/staging-x86_64/PKGBUILD ]];then
+        repo=staging-x86_64
+    elif [[ -f $pkg/repos/staging-any/PKGBUILD ]];then
+        repo=staging-any
+    fi
+
+    if [[ -f $pkg/repos/community-x86_64/PKGBUILD ]];then
+        repo=community-x86_64
+    elif [[ -f $pkg/repos/community-any/PKGBUILD ]];then
+        repo=community-any
+    fi
+
+    if [[ -f $pkg/repos/community-testing-x86_64/PKGBUILD ]];then
+        repo=community-testing-x86_64
+    elif [[ -f $pkg/repos/community-testing-any/PKGBUILD ]];then
+        repo=community-testing-any
+    fi
+
+    if [[ -f $pkg/repos/community-staging-x86_64/PKGBUILD ]];then
+        repo=community-staging-x86_64
+    elif [[ -f $pkg/repos/community-staging-any/PKGBUILD ]];then
+        repo=community-staging-any
+    fi
+
+    if [[ -f $pkg/repos/multilib-x86_64/PKGBUILD ]];then
+        repo=multilib-x86_64
+    fi
+
+    if [[ -f $pkg/repos/multilib-testing-x86_64/PKGBUILD ]];then
+        repo=multilib-testing-x86_64
+    fi
+
+    if [[ -f $pkg/repos/multilib-staging-x86_64/PKGBUILD ]];then
+        repo=multilib-staging-x86_64
+    fi
+
+    if $incl;then
+        if [[ -f $pkg/repos/gnome-unstable-x86_64/PKGBUILD ]];then
+            repo=gnome-unstable-x86_64
+        elif [[ -f $pkg/repos/gnome-unstable-any/PKGBUILD ]];then
+            repo=gnome-unstable-any
+        fi
+
+        if [[ -f $pkg/repos/kde-unstable-x86_64/PKGBUILD ]];then
+            repo=kde-unstable-x86_64
+        elif [[ -f $pkg/repos/kde-unstable-any/PKGBUILD ]];then
+            repo=kde-unstable-any
+        fi
+    fi
+    echo $repo
+}
+
+arch_to_artix_repo(){
+    local repo="$1"
+    case $repo in
+        core-*) repo=system ;;
+        extra-*) repo=world ;;
+        community-x86_64|community-any) repo=galaxy ;;
+        multilib-x86_64) repo=lib32 ;;
+        testing-*) repo=gremlins ;;
+        staging-*) repo=goblins ;;
+        multilib-testing-x86_64) repo=lib32-gremlins ;;
+        multilib-staging-x86_64) repo=lib32-goblins ;;
+        community-testing-*) repo=galaxy-gremlins ;;
+        community-staging-*) repo=galaxy-goblins ;;
+        kde-unstable-*|gnome-unstable-*) repo=goblins ;;
+    esac
+    echo $repo
 }
 
 # $1: sofile
@@ -45,39 +241,15 @@ pkgver_equal() {
     fi
 }
 
-get_full_version() {
-    # set defaults if they weren't specified in buildfile
-    pkgbase=${pkgbase:-${pkgname[0]}}
-    epoch=${epoch:-0}
-    if [[ -z $1 ]]; then
-        if [[ $epoch ]] && (( ! $epoch )); then
-            echo $pkgver-$pkgrel
-        else
-            echo $epoch:$pkgver-$pkgrel
-        fi
-    else
-        for i in pkgver pkgrel epoch; do
-            local indirect="${i}_override"
-            eval $(declare -f package_$1 | sed -n "s/\(^[[:space:]]*$i=\)/${i}_override=/p")
-            [[ -z ${!indirect} ]] && eval ${indirect}=\"${!i}\"
-        done
-        if (( ! $epoch_override )); then
-            echo $pkgver_override-$pkgrel_override
-        else
-            echo $epoch_override:$pkgver_override-$pkgrel_override
-        fi
-    fi
-}
-
 find_cached_package() {
-    local searchdirs=("$PWD" "$PKGDEST") results=()
+    local searchdirs=("$PKGDEST" "$PWD") results=()
     local targetname=$1 targetver=$2 targetarch=$3
     local dir pkg pkgbasename name ver rel arch r results
 
     for dir in "${searchdirs[@]}"; do
         [[ -d $dir ]] || continue
 
-        for pkg in "$dir"/*.pkg.tar.xz; do
+        for pkg in "$dir"/*.pkg.tar.?z; do
             [[ -f $pkg ]] || continue
 
             # avoid adding duplicates of the same inode
@@ -87,7 +259,7 @@ find_cached_package() {
 
             # split apart package filename into parts
             pkgbasename=${pkg##*/}
-            pkgbasename=${pkgbasename%.pkg.tar?(.?z)}
+            pkgbasename=${pkgbasename%.pkg.tar.?z}
 
             arch=${pkgbasename##*-}
             pkgbasename=${pkgbasename%-"$arch"}
@@ -107,16 +279,16 @@ find_cached_package() {
 
     case ${#results[*]} in
         0)
-        return 1
+            return 1
         ;;
         1)
-        printf '%s\n' "$results"
+            printf '%s\n' "${results[0]}"
-        return 0
+            return 0
         ;;
         *)
-        error 'Multiple packages found:'
+            error 'Multiple packages found:'
-        printf '\t%s\n' "${results[@]}" >&2
+            printf '\t%s\n' "${results[@]}" >&2
-        return 1
+            return 1
         ;;
     esac
 }

lib/util-yaml-check.sh

@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-import ${LIBDIR}/util-yaml.sh
-
-write_netgroup_yaml(){
-    local name="$1" yaml="$2"
-    msg2 "Writing %s ..." "${yaml##*/}"
-    echo "---" > "$yaml"
-    echo "- name: '$name'" >> "$yaml"
-    echo "  description: '$name'" >> "$yaml"
-    echo "  selected: false" >> "$yaml"
-    echo "  hidden: false" >> "$yaml"
-    echo "  critical: false" >> "$yaml"
-    echo "  packages:" >> "$yaml"
-    for p in ${packages[@]};do
-        echo "       - $p" >> "$yaml"
-    done
-}
-
-write_pacman_group_yaml(){
-    local group="$1"
-    packages=$(pacman -Sgq "$group")
-    prepare_dir "${cache_dir_netinstall}/pacman"
-    write_netgroup_yaml "$group" "${cache_dir_netinstall}/pacman/$group.yaml"
-}
-
-gen_fn(){
-    echo "${yaml_dir}/$1-${target_arch}-${initsys}.yaml"
-}
-
-prepare_build(){
-    local profile_dir=${run_dir}/${profile}
-
-    load_profile "${profile_dir}"
-
-    yaml_dir=${cache_dir_netinstall}/${profile}/${target_arch}
-
-    prepare_dir "${yaml_dir}"
-}
-
-build(){
-    prepare_build
-    load_pkgs "${root_list}" "${target_arch}" "${initsys}" "${kernel}"
-    write_netgroup_yaml "${profile}" "$(gen_fn "Packages-Root")"
-    if [[ -f "${desktop_list}" ]]; then
-        load_pkgs "${desktop_list}" "${target_arch}" "${initsys}" "${kernel}"
-        write_netgroup_yaml "${profile}" "$(gen_fn "Packages-Desktop")"
-    fi
-    ${calamares} && configure_calamares "${yaml_dir}"
-    reset_profile
-    unset yaml_dir
-}

lib/util-yaml.sh

@@ -1,222 +0,0 @@
-#!/bin/bash
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-write_machineid_conf(){
-    local conf="${modules_dir}/machineid.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo '---' > "$conf"
-    echo "systemd: false" >> $conf
-    echo "dbus: true" >> $conf
-    echo "symlink: true" >> $conf
-}
-
-write_finished_conf(){
-    msg2 "Writing %s ..." "finished.conf"
-    local conf="${modules_dir}/finished.conf" cmd="loginctl reboot"
-    echo '---' > "$conf"
-    echo 'restartNowEnabled: true' >> "$conf"
-    echo 'restartNowChecked: false' >> "$conf"
-    echo "restartNowCommand: \"${cmd}\"" >> "$conf"
-}
-
-get_preset(){
-    local p=${tmp_dir}/${kernel}.preset
-    cp ${DATADIR}/linux.preset $p
-    sed -e "s|@kernel@|$kernel|g" \
-        -e "s|@arch@|${target_arch}|g"\
-        -i $p
-    echo $p
-}
-
-write_bootloader_conf(){
-    local conf="${modules_dir}/bootloader.conf" efi_boot_loader='grub'
-    msg2 "Writing %s ..." "${conf##*/}"
-    source "$(get_preset)"
-    echo '---' > "$conf"
-    echo "efiBootLoader: \"${efi_boot_loader}\"" >> "$conf"
-    echo "kernel: \"${ALL_kver#*/boot}\"" >> "$conf"
-    echo "img: \"${default_image#*/boot}\"" >> "$conf"
-    echo "fallback: \"${fallback_image#*/boot}\"" >> "$conf"
-    echo 'timeout: "10"' >> "$conf"
-    echo "kernelLine: \", with ${kernel}\"" >> "$conf"
-    echo "fallbackKernelLine: \", with ${kernel} (fallback initramfs)\"" >> "$conf"
-    echo 'grubInstall: "grub-install"' >> "$conf"
-    echo 'grubMkconfig: "grub-mkconfig"' >> "$conf"
-    echo 'grubCfg: "/boot/grub/grub.cfg"' >> "$conf"
-    echo '#efiBootloaderId: "dirname"' >> "$conf"
-}
-
-write_servicescfg_conf(){
-    local conf="${modules_dir}/servicescfg.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo '---' >  "$conf"
-    echo '' >> "$conf"
-    echo 'services:' >> "$conf"
-    echo '    enabled:' >> "$conf"
-    for s in ${openrc_boot[@]};do
-        echo "      - name: $s" >> "$conf"
-        echo '        runlevel: boot' >> "$conf"
-    done
-    for s in ${openrc_default[@]};do
-        echo "      - name: $s" >> "$conf"
-        echo '        runlevel: default' >> "$conf"
-    done
-}
-
-write_displaymanager_conf(){
-    local conf="${modules_dir}/displaymanager.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "displaymanagers:" >> "$conf"
-    echo "  - lightdm" >> "$conf"
-    echo "  - gdm" >> "$conf"
-    echo "  - mdm" >> "$conf"
-    echo "  - sddm" >> "$conf"
-    echo "  - lxdm" >> "$conf"
-    echo "  - slim" >> "$conf"
-    echo '' >> "$conf"
-    echo "basicSetup: false" >> "$conf"
-}
-
-write_initcpio_conf(){
-    local conf="${modules_dir}/initcpio.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "kernel: ${kernel}" >> "$conf"
-}
-
-write_users_conf(){
-    local conf="${modules_dir}/users.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "defaultGroups:" >> "$conf"
-    local IFS=','
-    for g in ${addgroups[@]};do
-        echo "    - $g" >> "$conf"
-    done
-    unset IFS
-    echo "autologinGroup:  autologin" >> "$conf"
-    echo "doAutologin:     false" >> "$conf" # can be either 'true' or 'false'
-    echo "sudoersGroup:    wheel" >> "$conf"
-    echo "setRootPassword: true" >> "$conf" # must be true, else some options get hidden
-    echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
-    echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
-    echo "avatarFilePath:  ~/.face" >> "$conf" # mostly used file-name for avatar
-}
-
-write_welcome_conf(){
-    local conf="${modules_dir}/welcome.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf" >> "$conf"
-    echo "showSupportUrl:         true" >> "$conf"
-    echo "showKnownIssuesUrl:     true" >> "$conf"
-    echo "showReleaseNotesUrl:    true" >> "$conf"
-    echo '' >> "$conf"
-    echo "requirements:" >> "$conf"
-    echo "    requiredStorage:    7.9" >> "$conf"
-    echo "    requiredRam:        1.0" >> "$conf"
-    echo "    internetCheckUrl:   https://github.com/cromnix" >> "$conf"
-    echo "    check:" >> "$conf"
-    echo "      - storage" >> "$conf"
-    echo "      - ram" >> "$conf"
-    echo "      - power" >> "$conf"
-    echo "      - internet" >> "$conf"
-    echo "      - root" >> "$conf"
-    echo "    required:" >> "$conf"
-    echo "      - storage" >> "$conf"
-    echo "      - ram" >> "$conf"
-    echo "      - root" >> "$conf"
-    echo "      - internet" >> "$conf"
-}
-
-write_umount_conf(){
-    local conf="${modules_dir}/umount.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo 'srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"' >> "$conf"
-    echo 'destLog: "/var/log/Calamares.log"' >> "$conf"
-}
-
-get_yaml(){
-    echo "netgroups-${initsys}.yaml"
-}
-
-write_netinstall_conf(){
-    local conf="${modules_dir}/netinstall.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "groupsUrl: ${netgroups}/$(get_yaml)" >> "$conf"
-}
-
-write_locale_conf(){
-    local conf="${modules_dir}/locale.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "localeGenPath: /etc/locale.gen" >> "$conf"
-    echo "geoipUrl: freegeoip.net" >> "$conf"
-}
-
-write_settings_conf(){
-    local conf="$1/etc/calamares/settings.conf"
-    msg2 "Writing %s ..." "${conf##*/}"
-    echo "---" > "$conf"
-    echo "modules-search: [ local ]" >> "$conf"
-    echo '' >> "$conf"
-    echo "sequence:" >> "$conf"
-    echo "    - show:" >> "$conf"
-    echo "        - welcome" >> "$conf" && write_welcome_conf
-    echo "        - locale" >> "$conf" && write_locale_conf
-    echo "        - keyboard" >> "$conf"
-    echo "        - partition" >> "$conf"
-    echo "        - users" >> "$conf" && write_users_conf
-    echo "        - netinstall" >> "$conf" && write_netinstall_conf
-    echo "        - summary" >> "$conf"
-    echo "    - exec:" >> "$conf"
-    echo "        - partition" >> "$conf"
-    echo "        - mount" >> "$conf"
-    echo "        - chrootcfg" >> "$conf"
-    echo "        - networkcfg" >> "$conf"
-    echo "        - machineid" >> "$conf" && write_machineid_conf
-    echo "        - fstab" >> "$conf"
-    echo "        - locale" >> "$conf"
-    echo "        - keyboard" >> "$conf"
-    echo "        - localecfg" >> "$conf"
-    echo "        - luksopenswaphookcfg" >> "$conf"
-    echo "        - luksbootkeyfile" >> "$conf"
-    echo "        - initcpiocfg" >> "$conf"
-    echo "        - initcpio" >> "$conf" && write_initcpio_conf
-    echo "        - users" >> "$conf"
-    echo "        - displaymanager" >> "$conf" && write_displaymanager_conf
-    echo "        - hwclock" >> "$conf"
-    case ${initsys} in
-        'openrc') echo "        - servicescfg" >> "$conf" && write_servicescfg_conf ;;
-    esac
-    echo "        - grubcfg" >> "$conf"
-    echo "        - bootloader" >> "$conf" && write_bootloader_conf
-    echo "        - postcfg" >> "$conf"
-    echo "        - umount" >> "$conf" && write_umount_conf
-    echo "    - show:" >> "$conf"
-    echo "        - finished" >> "$conf" && write_finished_conf
-    echo '' >> "$conf"
-    echo "branding: ${os_id}" >> "$conf"
-    echo '' >> "$conf"
-    echo "prompt-install: false" >> "$conf"
-    echo '' >> "$conf"
-    echo "dont-chroot: false" >> "$conf"
-}
-
-configure_calamares(){
-    info "Configuring [Calamares]"
-    modules_dir=$1/etc/calamares/modules
-    prepare_dir "${modules_dir}"
-    write_settings_conf "$1"
-    info "Done configuring [Calamares]"
-}

lib/util.sh

@@ -27,7 +27,7 @@ load_vars() {
     [[ -f $1 ]] || return 1
 
     for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER CARCH GPGKEY; do
-        [[ -z ${!var} ]] && eval $(grep -a "^${var}=" "$1")
+        [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$1")"
     done
 
     return 0
@@ -37,16 +37,6 @@ prepare_dir(){
     [[ ! -d $1 ]] && mkdir -p $1
 }
 
-get_release(){
-    source /etc/lsb-release
-    echo "${DISTRIB_RELEASE}"
-}
-
-get_distname(){
-    source /etc/lsb-release
-    echo "${DISTRIB_ID%Linux}"
-}
-
 get_disturl(){
     source /usr/lib/os-release
     echo "${HOME_URL}"
@@ -64,24 +54,10 @@ get_osid(){
 
 init_artools_base(){
 
-    [[ -z ${target_arch} ]] && target_arch=$(uname -m)
+    target_arch=$(uname -m)
 
     [[ -z ${chroots_dir} ]] && chroots_dir='/var/lib/artools'
 
-    [[ -z ${build_mirror} ]] && build_mirror='https://downloads.sourceforge.net/project/artix-linux/repos'
-
-    log_dir='/var/log/artools'
-
-    tmp_dir='/tmp'
-
-    host="sourceforge.net"
-
-    [[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
-
-    [[ -z ${project} ]] && project="artix-linux"
-
-    [[ -z ${account} ]] && account="[SetUser]"
-
     [[ -z ${workspace_dir} ]] && workspace_dir=/home/${OWNER}/artools-workspace
 
     prepare_dir "${workspace_dir}"
@@ -91,61 +67,37 @@ init_artools_pkg(){
 
     [[ -z ${tree_dir_artix} ]] && tree_dir_artix=${workspace_dir}/artix
 
-    [[ -z ${repo_tree_artix[@]} ]] && repo_tree_artix=('system' 'world' 'galaxy')
-
-    [[ -z ${repo_tree_import[@]} ]] && repo_tree_import=('system-arch' 'world-arch' 'galaxy-arch')
-
     [[ -z ${host_tree_artix} ]] && host_tree_artix='https://github.com/artix-linux'
 
     [[ -z ${tree_dir_arch} ]] && tree_dir_arch=${workspace_dir}/archlinux
 
-    [[ -z ${repo_tree_arch} ]] && repo_tree_arch=('packages' 'community')
-
     [[ -z ${host_tree_arch} ]] && host_tree_arch='git://projects.archlinux.org/svntogit'
 
-    list_dir_import="${SYSCONFDIR}/import.list.d"
-
-    [[ -d ${AT_USERCONFDIR}/import.list.d ]] && list_dir_import=${AT_USERCONFDIR}/import.list.d
-
     chroots_pkg="${chroots_dir}/buildpkg"
 
-    list_dir_pkg="${SYSCONFDIR}/pkg.list.d"
+    [[ -z ${repos_root} ]] && repos_root="${workspace_dir}/repos"
-
-    make_conf_dir="${SYSCONFDIR}/make.conf.d"
-
-    [[ -d ${AT_USERCONFDIR}/pkg.list.d ]] && list_dir_pkg=${AT_USERCONFDIR}/pkg.list.d
-
-    cache_dir_pkg=${workspace_dir}/pkg
-
-    prepare_dir "${cache_dir_pkg}"
-
-    repository='system'
-
-    [[ -z ${repos_local} ]] && repos_local="${workspace_dir}/repos"
-
-    repos_remote="/${repos_local##*/}"
 }
 
 init_artools_iso(){
     chroots_iso="${chroots_dir}/buildiso"
 
-    cache_dir_iso="${workspace_dir}/iso"
+    [[ -z ${iso_pool} ]] && iso_pool="${workspace_dir}/iso"
 
-    prepare_dir "${cache_dir_iso}"
+    prepare_dir "${iso_pool}"
 
-    [[ -z ${profile} ]] && profile='base'
+    profile='base'
 
-    [[ -z ${dist_release} ]] && dist_release=$(get_release)
+    [[ -z ${iso_version} ]] && iso_version=$(date +%Y%m%d)
 
-    dist_name=$(get_distname)
+    iso_name=$(get_osid)
 
-    os_id=$(get_osid)
+    iso_label="ARTIX_$(date +%Y%m)"
-
-    [[ -z ${dist_branding} ]] && dist_branding="ARTIX"
 
     [[ -z ${initsys} ]] && initsys="openrc"
 
-    [[ -z ${kernel} ]] && kernel="linux-lts"
+    [[ -z ${kernel} ]] && kernel="linux"
+
+    [[ -z ${kernel_args} ]] && kernel_args=""
 
     [[ -z ${gpgkey} ]] && gpgkey=''
 
@@ -155,6 +107,14 @@ init_artools_iso(){
 
     [[ -z ${piece_size} ]] && piece_size=21
 
+    [[ -z ${file_host} ]] && file_host="sourceforge.net"
+
+    [[ -z ${project} ]] && project="artix-linux"
+
+    [[ -z ${account} ]] && account="[SetUser]"
+
+    [[ -z ${host_mirrors[@]} ]] && host_mirrors=('netcologne' 'freefr' 'netix' 'kent' '10gbps-io')
+
     torrent_meta="$(get_osname)"
 }
 
@@ -227,8 +187,3 @@ check_root() {
         exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
     fi
 }
-
-connect(){
-    local home="/home/frs/project/${project}"
-    echo "${account},${project}@frs.${host}:${home}"
-}