build.sh improvements and variant-i3wm fixes

Merge request reports

Loading