From 02ca5011a3ccf62bdc2afd277f9f2b175c0ecdeb Mon Sep 17 00:00:00 2001 From: thomcatdotrocks <37344783+thomcatdotrocks@users.noreply.github.com> Date: Fri, 31 Jul 2020 15:59:13 -0500 Subject: [PATCH 1/4] Updating package.sh This should correct the tarball structure from `riot-$version` to `element-$version`. --- scripts/package.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/package.sh b/scripts/package.sh index 70569fdacb..3960208e28 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -16,20 +16,20 @@ yarn build cp config.sample.json webapp/ mkdir -p dist -cp -r webapp riot-$version +cp -r webapp element-$version # Just in case you have a local config, remove it before packaging -rm riot-$version/config.json || true +rm element-$version/config.json || true # if $version looks like semver with leading v, strip it before writing to file if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then - echo ${version:1} > riot-$version/version + echo ${version:1} > element-$version/version else - echo ${version} > riot-$version/version + echo ${version} > element-$version/version fi -tar chvzf dist/riot-$version.tar.gz riot-$version -rm -r riot-$version +tar chvzf dist/element-$version.tar.gz element-$version +rm -r element-$version echo -echo "Packaged dist/riot-$version.tar.gz" +echo "Packaged dist/element-$version.tar.gz" From 65f37665e4254157f5d91c129c4b9220aeb5c681 Mon Sep 17 00:00:00 2001 From: thomcatdotrocks <37344783+thomcatdotrocks@users.noreply.github.com> Date: Fri, 31 Jul 2020 16:08:38 -0500 Subject: [PATCH 2/4] Update AUTHORS.rst --- AUTHORS.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index a92ca066cc..8845e9f960 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -16,3 +16,6 @@ include: * Alexandr Korsak (https://github.com/oivoodoo) Improved multiple file uploading + +* Thom Cleary (https://github.com/thomcatdotrocks) + Small correction for tarball deployment From 6092bb3ae07c2a75158ca549ca93f8a70c1ceb84 Mon Sep 17 00:00:00 2001 From: thomcatdotrocks <37344783+thomcatdotrocks@users.noreply.github.com> Date: Mon, 3 Aug 2020 09:28:50 -0500 Subject: [PATCH 3/4] Update AUTHORS.rst --- AUTHORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 8845e9f960..d027b59c99 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -18,4 +18,4 @@ include: Improved multiple file uploading * Thom Cleary (https://github.com/thomcatdotrocks) - Small correction for tarball deployment + Small update for tarball deployment From 6583064cb418acba04f10bfc8c92744b2a5234f2 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 24 Nov 2020 14:05:44 +0000 Subject: [PATCH 4/4] A few additional packaging changes This renames a few more packaging bits to match the new brand. Fixes https://github.com/vector-im/element-web/issues/14896 --- README.md | 4 ++-- element.io/app/deploy.py | 2 +- package.json | 2 +- scripts/ci_package.sh | 2 +- scripts/deploy.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c54eac9dc5..1f2a5c1fa5 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,14 @@ released version of Element: 1. Download the latest version from https://github.com/vector-im/element-web/releases 1. Untar the tarball on your web server -1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name +1. Move (or symlink) the `element-x.x.x` directory to an appropriate name 1. Configure the correct caching headers in your webserver (see below) 1. If desired, copy `config.sample.json` to `config.json` and edit it as desired. See the [configuration docs](docs/config.md) for details. 1. Enter the URL into your browser and log into Element! Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located -at https://packages.riot.im/riot-release-key.asc. +at https://packages.riot.im/element-release-key.asc. Note that for the security of your chats will need to serve Element over HTTPS. Major browsers also do not allow you to use VoIP/video diff --git a/element.io/app/deploy.py b/element.io/app/deploy.py index 33aa0af017..a0e8d96dcb 100755 --- a/element.io/app/deploy.py +++ b/element.io/app/deploy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# download and unpack a riot-web tarball. +# download and unpack a element-web tarball. # # Allows `bundles` to be extracted to a common directory, and a link to # config.json to be added. diff --git a/package.json b/package.json index b5b896b429..13df8e1957 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "author": "New Vector Ltd.", "repository": { "type": "git", - "url": "https://github.com/vector-im/riot-web" + "url": "https://github.com/vector-im/element-web" }, "license": "Apache-2.0", "files": [ diff --git a/scripts/ci_package.sh b/scripts/ci_package.sh index 4c6f280012..2b82db737f 100755 --- a/scripts/ci_package.sh +++ b/scripts/ci_package.sh @@ -6,7 +6,7 @@ set -ex -rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist +rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist # Since the deps are fetched from git, we can rev-parse REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD) diff --git a/scripts/deploy.py b/scripts/deploy.py index 33aa0af017..a0e8d96dcb 100755 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# download and unpack a riot-web tarball. +# download and unpack a element-web tarball. # # Allows `bundles` to be extracted to a common directory, and a link to # config.json to be added.