more clean up

Makefile

@@ -3,9 +3,7 @@ VERSION=0.9
 CHROOT_VERSION=0.8
 
 TOOLS = artools
-ifdef PREFIX
+PREFIX ?= /usr/local
-PREFIX = /usr/local
-endif
 SYSCONFDIR = /etc
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib

bin/mkchrootpkg.in

@@ -210,10 +210,6 @@ _chrootbuild() {
 
     #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 "$@"
 
     ret=$?

lib/util-iso-profile.sh

@@ -94,21 +94,19 @@ load_pkgs(){
     local pkglist="$1" init="$2"
     info "Loading Packages: [%s] ..." "${pkglist##*/}"
 
-    local _init="s|>$init||g"
+    local _init="s|@$init||g"
     case "$init" in
-        'openrc') _init_rm1="s|>runit.*||g"; _init_rm2="s|>s6*||g" ;;
+        'openrc') _init_rm1="s|@runit.*||g"; _init_rm2="s|@s6*||g" ;;
-        's6') _init_rm1="s|>runit.*||g"; _init_rm2="s|>openrc.*||g" ;;
+        's6') _init_rm1="s|@runit.*||g"; _init_rm2="s|@openrc.*||g" ;;
-        'runit') _init_rm1="s|>s6.*||g"; _init_rm2="s|>openrc.*||g" ;;
+        'runit') _init_rm1="s|@s6.*||g"; _init_rm2="s|@openrc.*||g" ;;
     esac
 
-    local _blacklist="s|>blacklist.*||g" \
+    local _space="s| ||g" \
-        _space="s| ||g" \
         _clean=':a;N;$!ba;s/\n/ /g' \
         _com_rm="s|#.*||g"
 
     packages=($(sed "$_com_rm" "$pkglist" \
             | sed "$_space" \
-            | sed "$_blacklist" \
             | sed "$_purge" \
             | sed "$_init" \
             | sed "$_init_rm1" \

lib/util.sh

@@ -96,7 +96,7 @@ init_artools_iso(){
 
     [[ -z ${gpgkey} ]] && gpgkey=''
 
-    [[ -z ${uplimit} ]] && uplimit=100
+    [[ -z ${uplimit} ]] && uplimit=1000
 
     [[ -z ${file_host} ]] && file_host="sourceforge.net"