ugh.

bdisk/bdisk.py

@@ -24,6 +24,6 @@ if __name__ == '__main__':
     prep.postChroot(conf['build'])
     build.genImg(conf['build'], conf['bdisk'])
     build.genUEFI(conf['build'], conf['bdisk'])
-    fulliso = build.geniso(conf)
+    fulliso = build.genISO(conf)
     build.displayStats(fulliso)
     print('Finished successfully at {0}.'.format(datetime.datetime.now()))

bdisk/prep.py

@@ -177,12 +177,12 @@ def prepChroot(build, bdisk, user):
     # v2.51-gb3bb039:3
     if os.path.isfile(dlpath + '/buildnum'):
         with open(dlpath + '/buildnum', 'r') as f:
-            build['buildnum'] = int(f.readlines())
+            build['buildnum'] = int(f.readlines()[0])
     else:
         build['buildnum'] = 0
     build['buildnum'] += 1
     with open(dlpath + '/buildnum', 'w+') as f:
-        f.write(build['buildnum'])
+        f.write(str(build['buildnum']))
     # and now that we have that dict, let's write out the VERSION_INFO.txt file.
     loader = jinja2.FileSystemLoader(templates_dir)
     env = jinja2.Environment(loader = loader)

extra/pre-build.d/i686/root/iso.pkgs.arch

@@ -1,6 +1,2 @@
 # Commented lines are supported (via a preceding # only).
 # Packages from the AUR can be specified.
-# If you require a package with a regex special character in the name
-# (i.e.: .\?+[]{} etc.)
-# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
-# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'

extra/pre-build.d/i686/root/packages.arch

@@ -1,6 +1,2 @@
 # Commented lines are supported (via a preceding # only).
 # Packages from the AUR can be specified.
-# If you require a package with a regex special character in the name
-# (i.e.: .\?+[]{} etc.)
-# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
-# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'

extra/pre-build.d/root/iso.pkgs.both

@@ -1,9 +1,5 @@
 # Commented lines are supported (via a preceding # only).
 # Packages from the AUR can be specified.
-# If you require a package with a regex special character in the name
-# (i.e.: .\?+[]{} etc.)
-# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
-# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
 arch-install-scripts
 archiso
 bzip2

extra/pre-build.d/root/packages.both

@@ -1,9 +1,5 @@
 # Commented lines are supported (via a preceding # only).
 # Packages from the AUR can be specified.
-# If you require a package with a regex special character in the name
-# (i.e.: .\?+[]{} etc.)
-# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
-# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'
 # We need to install all X drivers.
 abs
 acpi
@@ -24,7 +20,7 @@ bin86
 bind-tools
 binutils
 bluez-utils
-bonnie\\+\\+
+#bonnie++ ## TODO: ugh. apacman has a new "regex mode"... that you can't disable. https://github.com/oshazard/apacman/issues/79
 boxbackup-client
 boxbackup-server
 bozocrack-git

extra/pre-build.d/root/pre-build.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-source /etc/bashrc
+source /etc/bash.bashrc
-source /root/.bashrc
 
 # we need this fix before anything.
 dirmngr </dev/null > /dev/null 2>&1
@@ -57,7 +56,7 @@ cleanPacorigs
 # Install multilib-devel if we're in an x86_64 chroot.
 if $(egrep -q '^\[multilib' /etc/pacman.conf);
 then
-	pacman --noconfirm -R gcc-libs libtool
+	pacman --noconfirm -Rdd gcc gcc-libs libtool
 	pacman --noconfirm -S --needed multilib-devel
 	cleanPacorigs
 	TGT_ARCH='x86_64'
@@ -86,7 +85,7 @@ ln -s /usr/lib/libdialog.so.1.2 /usr/lib/libdialog.so
 cleanPacorigs
 apacman --noconfirm --noedit --skipinteg -S --needed linux
 apacman --gendb
-mv /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
+mv -f /boot/vmlinuz-linux /boot/vmlinuz-linux-${DISTNAME}
 cleanPacorigs
 
 # And install EXTRA functionality packages, if there are any.
@@ -126,7 +125,7 @@ else
 	usermod -L root
 fi
 cleanPacorigs
-mv /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
+mv -f /boot/initramfs-linux.img /boot/initramfs-linux-${DISTNAME}.img
 # And install arch-specific extra packages, if there are any.
 PKGLIST=$(sed -e '/^[[:space:]]*#/d ; /^[[:space:]]*$/d' /root/packages.arch | tr '\n' ' ')
 if [[ -n "${PKGLIST}" ]];

extra/pre-build.d/x86_64/root/iso.pkgs.arch

@@ -1,6 +1,2 @@
 # Commented lines are supported (via a preceding # only).
 # Packages from the AUR can be specified.
-# If you require a package with a regex special character in the name
-# (i.e.: .\?+[]{} etc.)
-# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
-# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'

extra/pre-build.d/x86_64/root/packages.arch

@@ -1,6 +1,2 @@
 # Commented lines are supported (via a preceding # only).
 # Packages from the AUR can be specified.
-# If you require a package with a regex special character in the name
-# (i.e.: .\?+[]{} etc.)
-# and it is part of the ACTUAL package name, then you must DOUBLE-ESCAPE it:
-# e.g. 'bonnie\\+\\+' for a package named 'bonnie++'