mirror of
https://github.com/vector-im/element-web.git
synced 2024-11-17 14:05:04 +08:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
dba05488bf
@ -94,6 +94,7 @@ 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"
|
||||||
|
rm -r "$projdir/electron_app/dist" || true
|
||||||
mkdir -p "$projdir/electron_app/dist/unsigned/"
|
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,
|
||||||
@ -122,8 +123,6 @@ cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/"
|
|||||||
cp $distdir/win/RELEASES "$pubdir/update/win32/x64/"
|
cp $distdir/win/RELEASES "$pubdir/update/win32/x64/"
|
||||||
|
|
||||||
# Move the debs to the main project dir's dist folder
|
# Move the debs to the main project dir's dist folder
|
||||||
rm -r "$projdir/electron_app/dist" || true
|
|
||||||
mkdir -p "$projdir/electron_app/dist"
|
|
||||||
cp $distdir/*.deb "$projdir/electron_app/dist/"
|
cp $distdir/*.deb "$projdir/electron_app/dist/"
|
||||||
|
|
||||||
rm -rf "$builddir"
|
rm -rf "$builddir"
|
||||||
|
Loading…
Reference in New Issue
Block a user