github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-04-01 13:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move apply_patches to its own script

Browse Source
This commit is contained in:
SpiritCroc 2024-08-07 08:06:21 +02:00
parent 977e955265
commit b04c8cc063
2 changed files with 27 additions and 14 deletions

26
apply_patches.sh Executable file

@ -0,0 +1,26 @@
#!/bin/bash
set -e
mydir="$(dirname "$(realpath "$0")")"
pushd "$mydir" > /dev/null
source ./merge_helpers.sh
# Apply our patches
apply_patches matrix-js-sdk
apply_patches matrix-react-sdk
#apply_patches element-web
apply_patches element-desktop
# Automatic adjustments
#automatic_i18n_adjustment
automatic_packagejson_adjustment
# Automatic theme update
#pushd "matrix-react-sdk" > /dev/null
#./theme.sh y
#popd > /dev/null
popd > /dev/null

15
merge_upstream.sh

@ -50,19 +50,6 @@ popd > /dev/null
make clean make clean
make setup make setup
# Apply our patches ./apply_patches.sh
apply_patches matrix-js-sdk
apply_patches matrix-react-sdk
#apply_patches element-web
apply_patches element-desktop
# Automatic adjustments
#automatic_i18n_adjustment
automatic_packagejson_adjustment
# Automatic theme update
#pushd "matrix-react-sdk" > /dev/null
#./theme.sh y
#popd > /dev/null
popd > /dev/null popd > /dev/null