shellscript to merge/cherrypick all open PR's resolving conflicts

merge.sh

#!/bin/sh
lastrelease_commit="18e237e"
set -x
set -e

test -d janusweb && rm -rf janusweb 
git clone https://github.com/jbaicoianu/janusweb janusweb 
cd janusweb 
git reset $lastrelease_commit --hard

# make sure leon's origin is added
git remote | grep coderofsalvation || {
  git remote add coderofsalvation https://github.com/coderofsalvation/janusweb
  git fetch coderofsalvation
}

# feat/webui-xrfragments
test -d media/assets/webui/apps/xrfragment && rm -rf media/assets/webui/apps/xrfragment
git pull coderofsalvation feat/webui-xrfragments

# https://github.com/jbaicoianu/janusweb/pull/298
git cherry-pick d47374dafbde1418094e1da3c9209ce7a882c35d

# https://github.com/jbaicoianu/janusweb/pull/300 standalone binary (janusweb.com)
git cherry-pick 8c5a233804233976d5428120621966a78c3160c7
git cherry-pick d7809ee321ee021c785b1443eb0e285d740d9c3d
git cherry-pick 3c70891949daa18922296370f3cd6e54f1a07d31
git cherry-pick 41cb824517979ecdf05293a5f7ae133f21168c64
git cherry-pick fa566bae63ac52c438d464e59d916fd46b20b693
git cherry-pick 4250a683183b21869d390dd9c576b91ec0a7c5cd
git cherry-pick 72881dcb734b80209361bf3eb02148f0e8a7c97c 

# https://github.com/jbaicoianu/janusweb/pull/304
set +e
git cherry-pick 5e5df69786be6db43862066e2f82fa0140fdfe20 
sed -i 's/^[<=>].*//g' scripts/janusparagraph.js # remove git lines
git add scripts/janusparagraph.js
git commit -m "merge conflict fix"
git cherry-pick cb09aa6 # paragraph fix
set -e

# https://github.com/jbaicoianu/janusweb/pull/290
git cherry-pick a189bb9e990f9abbeb6f90f85d340e36582088cd

# https://github.com/jbaicoianu/janusweb/pull/295 peertube
set +e
test -f scripts/translators/peertube.js && rm scripts/translators/peertube.js
git cherry-pick 1fb7878c036793e1e80e463fb0dfaec9ee742607
sed -i 's/^[<=>].*//g' scripts/room.js # remove git lines
sed -i 's/    roomTranslators = {$//g' scripts/room.js
git add scripts/room.js
git commit -m "merge conflict fix"
set -e

set -x
echo -e "\n\n\\o/ everything applied!\n\n"

npm install
npm run build

## clean build
#npm install
#[ -e elation ] && rm -r elation
#[ -e node_modules ] && rm -r node_modules
#[ -d build ] && rm -r build
#utils/build.sh

read -p "> release + binary? [y/n]" ok
test $ok = y && {
  test -d build || mkdir build
  touch -f build/1.7.0/foo.com
  utils/release.sh
  utils/release.binary.sh 
}