PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-09-06 12:29:15 +00:00
commit ba6b35ad84
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/electron-package.sh
View file

@ -94,17 +94,19 @@ distdir="$builddir/electron_app/dist"
pubdir="$projdir/electron_app/pub" pubdir="$projdir/electron_app/pub"
rm -r "$pubdir" || true rm -r "$pubdir" || true
mkdir -p "$pubdir" mkdir -p "$pubdir"
mkdir -p "$projdir/electron_app/dist/unsigned/"
# Install packages: what the user downloads the first time, # Install packages: what the user downloads the first time,
# (DMGs for mac, exe installer for windows) # (DMGs for mac, exe installer for windows)
mkdir -p "$pubdir/install/macos" mkdir -p "$pubdir/install/macos"
cp $distdir/mac/*.dmg "$pubdir/install/macos/" cp $distdir/mac/*.dmg "$pubdir/install/macos/"
# Windows installers go to the dist dir because they need signing
mkdir -p "$pubdir/install/win32/ia32/" mkdir -p "$pubdir/install/win32/ia32/"
cp $distdir/win-ia32/*.exe "$pubdir/install/win32/ia32/" cp $distdir/win-ia32/*.exe "$projdir/electron_app/dist/unsigned/"
mkdir -p "$pubdir/install/win32/x64/" mkdir -p "$pubdir/install/win32/x64/"
cp $distdir/win/*.exe "$pubdir/install/win32/x64/" cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/"
# Packages for auto-update # Packages for auto-update
mkdir -p "$pubdir/update/macos" mkdir -p "$pubdir/update/macos"
@ -126,5 +128,7 @@ cp $distdir/*.deb "$projdir/electron_app/dist/"
rm -rf "$builddir" rm -rf "$builddir"
echo "Riot Desktop is ready to go in $pubdir: this directory can be hosted on your web server." echo "Unsigned Windows installers have been placed in electron_app/dist/unsigned/ - sign them,"
echo "or just copy them to "$pubdir/install/win32/\<arch\>/""
echo "Once you've done this, $pubdir can be hosted on your web server."
echo "deb archives are in electron_app/dist/ - these should be added into your debian repository" echo "deb archives are in electron_app/dist/ - these should be added into your debian repository"