diff --git a/release/arch/debian/Vagrantfile b/release/arch/debian/Vagrantfile index 5a7820f4ea3b6acca874fbdfab0040ced4f9e493..da912f7fbaa6332b1081e4f486ca5e24dc3086ea 100644 --- a/release/arch/debian/Vagrantfile +++ b/release/arch/debian/Vagrantfile @@ -12,7 +12,7 @@ Vagrant.configure("2") do |config| # Every Vagrant development environment requires a box. You can search for # boxes at https://atlas.hashicorp.com/search. - config.vm.box = "https://s3.eu-central-1.amazonaws.com/duniter/vagrant/duniter_ubuntu.box" + config.vm.box = "https://s3.eu-central-1.amazonaws.com/duniter/vagrant/duniter_trusty64.box" config.vm.provision :shell, path: "bootstrap.sh" # Disable automatic box update checking. If you disable this, then diff --git a/release/arch/debian/bootstrap.sh b/release/arch/debian/bootstrap.sh index 529eb51f5e562cb063439e7b2b780d65fd3d64e1..6666f97b5365f01b41da099362a4e4ae51301e2f 100644 --- a/release/arch/debian/bootstrap.sh +++ b/release/arch/debian/bootstrap.sh @@ -9,4 +9,4 @@ apt-get update apt-get install --yes git curl build-essential yarn python-minimal zip # User installation -sudo su ubuntu -c "bash /vagrant/user-bootstrap.sh" +sudo su vagrant -c "bash /vagrant/user-bootstrap.sh" diff --git a/release/arch/debian/build-deb.sh b/release/arch/debian/build-deb.sh index 559db82bd1ee9e7b359803ad45ae37f32f68c26e..ebc1a54b8ded6049246fcd31fc25b9cf42355129 100644 --- a/release/arch/debian/build-deb.sh +++ b/release/arch/debian/build-deb.sh @@ -126,10 +126,16 @@ cd "$RELEASES/desktop_/node_modules/sqlite3" node-pre-gyp --runtime=node-webkit --target=$NW_VERSION configure node-pre-gyp --runtime=node-webkit --target=$NW_VERSION build cp lib/binding/node-webkit-$NW_RELEASE-linux-x64/node_sqlite3.node lib/binding/node-v$ADDON_VERSION-linux-x64/node_sqlite3.node +cd "$RELEASES/desktop_/node_modules/heapdump" +nw-gyp --target=$NW_VERSION configure +nw-gyp --target=$NW_VERSION build # Unused binaries cd "$RELEASES/desktop_/" rm -rf node_modules/sqlite3/build +#rm -rf node_modules/naclb/build +#rm -rf node_modules/wotb/build +#rm -rf node_modules/scryptb/build ## Install Nw.js mkdir -p "$RELEASES/desktop_release" @@ -155,7 +161,7 @@ tar czf /vagrant/duniter-desktop-${DUNITER_TAG}-linux-x64.tar.gz * --exclude ".g # ------------------------------------------------- # Create .deb tree + package it -cp -r "$RELEASES/desktop_release/sources/ci/travis/debian" "$RELEASES/duniter-x64" +cp -r "$RELEASES/desktop_release/sources/release/arch/debian/package" "$RELEASES/duniter-x64" mkdir -p "$RELEASES/duniter-x64/opt/duniter/" chmod 755 ${RELEASES}/duniter-x64/DEBIAN/post* chmod 755 ${RELEASES}/duniter-x64/DEBIAN/pre*