Merge branch 'master' into building-on-stretch

This commit is contained in:
Alexandre Aubin 2018-03-08 20:53:55 +01:00 committed by GitHub
commit de7196d639
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -71,10 +71,11 @@ function sign
{
local ARCH="$1"
local NAME="images/yunohost-$DEB_DIST-$YNH_VERSION-$ARCH-$DIST.iso"
info "Signing image $NAME ..."
gpg --output $NAME.sig --detach-sig $NAME
sudo gpg --output $NAME.sig --detach-sig $NAME
sha256sum $NAME > $NAME.sum
}
@ -88,15 +89,8 @@ function build_and_sign
sign $ARCH
}
function assert_not_root
{
[[ $EUID -ne 0 ]] || critical "You should not run this script as root !"
}
function main
{
assert_not_root
if [ -z "$ARCH_CHOICE" ]
then
info "No arch chosen, will build both i396 and amd64"