Merge pull request #15810 from vector-im/jryans/rebrand-packaged-artifact

Update branding of packaging artifacts

AUTHORS.rst

@@ -16,3 +16,6 @@ include:
 
 * Alexandr Korsak (https://github.com/oivoodoo)
   Improved multiple file uploading
+
+* Thom Cleary (https://github.com/thomcatdotrocks)
+  Small update for tarball deployment

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

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.

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": [

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)

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.

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"