Call setup after upstream merge and ensure branch

README.md

@@ -59,8 +59,8 @@ cd schildichat-desktop
 
 ## Build
 
-`make`
+`make [{web|debian|pacman|windows}-release]`
 
 ## Install
 
-Installable packages should appear in element-desktop/dist/.
+Installable packages should appear in release/.

merge_helpers.sh

@@ -37,3 +37,18 @@ 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,13 +3,18 @@
 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