.gitignore

@@ -1,2 +1 @@
 release.mk
-/release

Makefile

@@ -1,46 +1,18 @@
-.PHONY: all setup web desktop desktop-common linux windows windows-portable
-.PHONY: web-release debian-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release release
-.PHONY: clean
+.PHONY: all web desktop desktop-common linux windows clean
 
 CFGDIR ?= configs/sc
 
-all: release
+all: desktop
 
 YARN ?= yarnpkg
 
-VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
-APP_NAME :=  $(shell grep '"name"' element-desktop/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
-PRODUCT_NAME :=  $(shell grep '"productName"' element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
-
-WEB_OUT := element-web/dist
-WEB_OUT_DIST_VERSION := web
-OUT_WEB := $(WEB_OUT)/riot-$(WEB_OUT_DIST_VERSION).tar.gz
-OUT_WEB_BETTER_NAME := schildichat-web-$(VERSION).tar.gz
-
-DESKTOP_OUT := element-desktop/dist
-OUT_DEB64 := $(DESKTOP_OUT)/$(APP_NAME)_$(VERSION)_amd64.deb
-OUT_PAC64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).pacman
-OUT_TARXZ64 := $(DESKTOP_OUT)/$(APP_NAME)-$(VERSION).tar.xz
-OUT_WIN64 := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ Setup\ $(VERSION).exe
-OUT_WIN64_PORTABLE := $(DESKTOP_OUT)/$(PRODUCT_NAME)\ $(VERSION).exe
-OUT_WIN64_BETTER_NAME := $(PRODUCT_NAME)_Setup_v$(VERSION).exe
-OUT_WIN64_UNPACKED_BETTER_NAME := $(PRODUCT_NAME)_win-unpacked_v$(VERSION).zip
-OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
-
-RELEASE_DIR := release
-CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
-
 
 -include release.mk
 
-setup:
-	if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
-	cp $(CFGDIR)/config.json element-web/
 
-web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
-web: setup
+web:
+	cp $(CFGDIR)/config.json element-web/
 	$(YARN) --cwd element-web dist
-	echo "$(VERSION)" > element-web/webapp/version
 
 desktop-common: web
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''
@@ -60,40 +32,8 @@ pacman: desktop-common
 windows: desktop-common
 	$(YARN) --cwd element-desktop run build64windows
 
-windows-portable: desktop-common
-	$(YARN) --cwd element-desktop run build64windows-portable
-
-web-release: web
-	mkdir -p $(CURRENT_RELEASE_DIR)
-	cp $(OUT_WEB) $(CURRENT_RELEASE_DIR)/$(OUT_WEB_BETTER_NAME)
-
-debian-release: debian
-	mkdir -p $(CURRENT_RELEASE_DIR)
-	cp $(OUT_DEB64) $(CURRENT_RELEASE_DIR)
-
-pacman-release: pacman
-	mkdir -p $(CURRENT_RELEASE_DIR)
-	cp $(OUT_PAC64) $(CURRENT_RELEASE_DIR)
-
-windows-setup-release: windows
-	mkdir -p $(CURRENT_RELEASE_DIR)
-	cp $(OUT_WIN64) $(CURRENT_RELEASE_DIR)/$(OUT_WIN64_BETTER_NAME)
-
-windows-unpacked-release: windows
-	mkdir -p $(CURRENT_RELEASE_DIR)
-	cd element-desktop/dist/win-unpacked && zip -r ../../../$(CURRENT_RELEASE_DIR)/$(OUT_WIN64_UNPACKED_BETTER_NAME) *
-
-windows-portable-release: windows-portable
-	./windowsportable.sh $(OUT_WIN64_PORTABLE) $(OUT_WIN64_PORTABLE_BETTER_NAME) $(CURRENT_RELEASE_DIR) $(VERSION)
-
-windows-release: windows-setup-release windows-unpacked-release windows-portable-release
-
-release: web-release debian-release pacman-release windows-release
-
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
 	$(YARN) --cwd matrix-react-sdk clean
 	$(YARN) --cwd element-web clean
 	$(YARN) --cwd element-desktop clean
-	rm -f element-desktop/webapp
-	rm -rf element-web/dist

README.md

@@ -54,13 +54,13 @@ $ source .bashrc
 ```
 git clone --recurse-submodules https://github.com/SchildiChat/schildichat-desktop.git
 cd schildichat-desktop
-make setup # optional step if using the other make targets
+./setup.sh
 ```
 
 ## Build
 
-`make [{web|debian|pacman|windows}-release]`
+`make`
 
 ## Install
 
-Installable packages should appear in release/.
+Installable packages should appear in element-desktop/dist/.

alternative_package.sh

@@ -50,31 +50,22 @@ logo_alternative() {
 # Analog to SchildiChat-Android's alternative_package.sh
 case "$package_add" in
 "a")
-    # blue
-    logo_alternative "#2196F3" "#0D47A1" "#BBDEFB"
+    # cyan
+    logo_alternative "#00ACC1" "#006064" "#B2EBF2"
     ;;
 "b")
     # orange: 900 color recuded in value
     logo_alternative "#FB8C00" "#7f2c00" "#FFE0B2"
     ;;
 "c")
-    # red: 900 color reduced in value
-    logo_alternative "#E53935" "#4c0b0b" "#FFCDD2"
-    ;;
-"d")
     # purple
     logo_alternative "#5E35B1" "#311B92" "#D1C4E9"
     ;;
-"e")
-    # pink
-    logo_alternative "#D81B60" "#880E4F" "#F8BBD0"
+"d")
+    # red: 900 color reduced in value
+    logo_alternative "#E53935" "#4c0b0b" "#FFCDD2"
     ;;
 "x")
-    # cyan
-    logo_alternative "#00ACC1" "#006064" "#B2EBF2"
-    ;;
-"z")
-    # white
     logo_alternative "#ffffff" "#000000" "#eeeeee"
     ;;
 esac

configs/sc/config.json

@@ -11,19 +11,30 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "roomDirectory": {
         "servers": [
             "matrix.org"
         ]
     },
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "siteId": 1,
+        "policyUrl": "https://element.io/cookie-policy"
+    },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
     "terms_and_conditions_links": [
         {
-            "url": "https://schildi.chat/desktop/privacy",
+            "url": "https://element.io/privacy",
             "text": "Privacy Policy"
+        },
+        {
+            "url": "https://element.io/cookie-policy",
+            "text": "Cookie Policy"
         }
     ]
 }

element-desktop

@@ -1 +1 @@
-Subproject commit 937f8a8c8682d47dc834619be4dd29956dca447a
+Subproject commit 3172fb927ddd4a63456028159f40d202512620de

element-web

@@ -1 +1 @@
-Subproject commit 9eeb0af50abbb52345103f429b2e16c96a5ffb18
+Subproject commit fc486a5044adcc6b39180ffaabd75360f242e635

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit 79a5b44eb508074511c661eb3d92b3d6a26b0f33
+Subproject commit 2ef998e8eca5aea54ab5f70e913d8b628290a8c1

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit 2a308ab739bfe4b7b272db403bb500fd93db84ea
+Subproject commit 6538fca287d25a6f9d986904e315f10b3e0baa5e

merge_helpers.sh

@@ -37,18 +37,3 @@ forall_repos() {
     "$@"
     popd
 }
-
-ensure_yes() {
-    read -e -p "$1 [y/N] " choice
-    
-    if [[ "$choice" != [Yy]* ]]; then
-        exit 1
-    fi
-}
-
-check_branch() {
-    if [[ $(git branch --show-current) != "$1" ]]; then
-        repo_name=$(basename `git rev-parse --show-toplevel`)
-        ensure_yes "$repo_name not in branch $1. Continue?"
-    fi
-}

merge_upstream.sh

@@ -3,18 +3,13 @@
 set -e
 
 mydir="$(dirname "$(realpath "$0")")"
-branch=${BRANCH:-"sc"}
 
 pushd "$mydir" > /dev/null
 
 source ./merge_helpers.sh
 
-check_branch $branch
-forall_repos check_branch $branch
 
 forall_repos git fetch upstream
 forall_repos git merge upstream/master
 
-./setup.sh
-
 popd > /dev/null

setup.sh

@@ -5,14 +5,12 @@ set -e
 yarn=yarnpkg
 
 pushd matrix-js-sdk
-$yarn unlink &>/dev/null || true
 $yarn link
 $yarn install
 popd
 
 pushd matrix-react-sdk
 $yarn link matrix-js-sdk
-$yarn unlink &>/dev/null || true
 $yarn link
 $yarn install
 popd
@@ -20,10 +18,14 @@ popd
 pushd element-web
 $yarn link matrix-js-sdk
 $yarn link matrix-react-sdk
+$yarn link
 $yarn install
 popd
 
 pushd element-desktop
+#$yarn link matrix-js-sdk
+#$yarn link matrix-react-sdk
+#$yarn link riot-web
 $yarn install
 ln -s ../element-web/webapp ./ || true
 popd

windowsportable.sh

@@ -1,63 +0,0 @@
-#!/bin/bash
-
-set -e
-
-portable_exe=$1
-dest_name=$2
-release_dir=$3
-version=$4
-
-dest_path=$release_dir/$dest_name/SchildiChat
-
-mkdir -p $dest_path/app
-cp "$portable_exe" $dest_path/app/dontclick.exe
-
-cat >$dest_path/SchildiChat_Portable.bat <<EOL
-REM -- Adapted from: https://superuser.com/a/1226026
-
-REM -- Path to the directory of this script (make sure to remove ending slash)
-set CURRENT_DIR=%~dp0
-REM -- Great example from Strawberry Perl's portable shell launcher:
-if not "" == "%CURRENT_DIR%" if #%CURRENT_DIR:~-1%# == #\# set CURRENT_DIR=%CURRENT_DIR:~0,-1%
-
-REM -- Path to data directory
-set DATA_DIR=%CURRENT_DIR%\data
-
-REM -- Ensure directories exists
-if not exist %DATA_DIR%\AppData\Roaming mkdir %DATA_DIR%\AppData\Roaming
-
-REM -- OVERRIDE the user environment variable to point to a portable directory
-set USERPROFILE=%DATA_DIR%
-
-REM -- (Optional) Some programs do not use these environment variables
-set APPDATA=%DATA_DIR%\AppData\Roaming>nul
-set ALLUSERSPROFILE=%DATA_DIR%\AppData\Roaming>nul
-set PROGRAMDATA=%DATA_DIR%\AppData\Roaming>nul
-
-REM -- Start the application
-start "" /D"%CURRENT_DIR%\app" "dontclick.exe"
-EOL
-
-cat >$dest_path/README.txt <<EOL
-Just extract this zip file to a folder of your choice (e.g. on a USB-Stick).
-The .\app\dontclick.exe file is the real portable executable.
-SchildiChat_Portable.bat is a batch script to run this executable but with the data in the .\data folder instead of the system's %APPDATA%.
-Thus you can move your data along with this portable app.
-To update just extract the new zip file to the same folder as the previous version whilst merging folders and overwriting files.
-EOL
-
-# if $version looks like semver with leading v, strip it before writing to file
-if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
-    echo ${version:1} > $dest_path/app/version
-else
-    echo ${version} > $dest_path/app/version
-fi
-
-pushd $dest_path/..
-zip -r ../$dest_name.zip *
-popd
-
-rm -r $release_dir/$dest_name
-
-echo
-echo "Packaged $release_dir/$dest_name.zip"