switch to bwrap, add skipsetup, don't hardcode 'user'

build

@@ -1,13 +1,17 @@
 #!/bin/sh
+
 set -e
 [ -d cache ] || mkdir cache
-SPAWN="systemd-nspawn -M gentoolooqsbuilder -D gentoo --bind=$(realpath ./out):/out --bind=$(realpath scripts):/scripts --bind=$(realpath cache):/var/cache/distfiles"
-export UNPRIVUSER="user"
 
+SPAWN="bwrap --bind gentoo / --dev /dev --proc /proc --perms 1777 --tmpfs /dev/shm --ro-bind /etc/resolv.conf /etc/resolv.conf --bind $(realpath ./out) /out --bind $(realpath scripts) /scripts --bind $(realpath cache) /var/cache/distfiles "
+export UNPRIVUSER=$(id -n -u 1000)
+
+if [ "$1" != "skipsetup" ] ; then
 su $UNPRIVUSER -c ./scripts/1-create.sh
 ./scripts/2-create.sh
 ${SPAWN} /scripts/3-setup-gentoo.sh
 chown "$UNPRIVUSER" -R out
+fi
 ${SPAWN} su - builder -c /scripts/4-build-looqs.sh
 chown "$UNPRIVUSER" -R out
 su $UNPRIVUSER -c "cd $(pwd); ./scripts/5-bundle.sh"

scripts/4-build-looqs.sh

@@ -23,6 +23,7 @@ make
 
 cp cli/looqs /out/bin/
 cp gui/looqs-gui /out/bin/
+cp LICENSE* /out/
 
 for lib in $( find /usr/lib64/ -mindepth 1 | grep libQt | grep .so ) ; do
 cp -a "$lib" /out/lib/

scripts/5-bundle.sh

@@ -8,6 +8,7 @@ rm -rf $DIRNAME*
 cp -a out ${DIRNAME}
 cp src/looqs-gui ${DIRNAME}
 cp src/looqs ${DIRNAME}
+cp src/README ${DIRNAME}
 chmod 755 src/looqs-gui
 chmod 755 src/looqs
 

scripts/CONFIG

@@ -1,2 +1,2 @@
-TAG="master"
+TAG="v0.4"
 SIGNING_KEY_EMAIL="repo@quitesimple.org"