diff --git a/code_patches.sh b/code_patches.sh index 803468f..32ad321 100755 --- a/code_patches.sh +++ b/code_patches.sh @@ -1,37 +1,46 @@ #!/bin/bash +set -euo pipefail +LWD="$PWD" -echo Backing up EmojiProvider.tsx... +# TODO: cleanup, generify backup + +echo 'Backing up EmojiProvider.tsx...' if [ ! -f ../node_modules/matrix-react-sdk/src/autocomplete/EmojiProvider_backup.tsx ]; then cp ../node_modules/matrix-react-sdk/src/autocomplete/EmojiProvider.tsx ../node_modules/matrix-react-sdk/src/autocomplete/EmojiProvider_backup.tsx else cp ../node_modules/matrix-react-sdk/src/autocomplete/EmojiProvider_backup.tsx ../node_modules/matrix-react-sdk/src/autocomplete/EmojiProvider.tsx fi -echo Backing up compact.json... +echo 'Backing up compact.json...' if [ ! -f ../node_modules/emojibase-data/en/compact_backup.json ]; then cp ../node_modules/emojibase-data/en/compact.json ../node_modules/emojibase-data/en/compact_backup.json else cp ../node_modules/emojibase-data/en/compact_backup.json ../node_modules/emojibase-data/en/compact.json fi -echo Adding custom emoji... -jq -s -c '.[0] + .[1]' "../node_modules/emojibase-data/en/compact_backup.json" "./emoji.json" > "../node_modules/emojibase-data/en/compact.json" +echo 'Adding custom emoji...' +{ + cd ./reactions; + ./generate.sh > "./data-injects~.json"; + jq -sc '.[0] + .[1]' "../node_modules/emojibase-data/en/compact_backup.json" "./data-injects~.json" > "../node_modules/emojibase-data/en/compact.json"; + rm "./data-injects~.json"; + cd "$LWD"; +} || { echo "Failed to inject reactions: Exit code $?" 1>&2; exit $?; } - -echo Copying custom login background... +echo 'Copying custom login background...' cp -f ./lake.jpg ../res/themes/element/img/backgrounds/lake.jpg -echo Copying custom config.json... +echo 'Copying custom config.json...' cp -f ./config.json ../config.sample.json -echo Backing up _EmojiPicker.scss... +echo 'Backing up _EmojiPicker.scss...' if [ ! -f ../node_modules/matrix-react-sdk/res/css/views/emojipicker/_EmojiPicker.scss.backup ]; then cp ../node_modules/matrix-react-sdk/res/css/views/emojipicker/_EmojiPicker.scss ../node_modules/matrix-react-sdk/res/css/views/emojipicker/_EmojiPicker.scss.backup else cp ../node_modules/matrix-react-sdk/res/css/views/emojipicker/_EmojiPicker.scss.backup ../node_modules/matrix-react-sdk/res/css/views/emojipicker/_EmojiPicker.scss fi -echo Adding custom emoji picker CSS... +echo 'Adding custom emoji picker CSS...' echo " .mx_EmojiPicker_item_wrapper { text-overflow: clip; @@ -40,13 +49,13 @@ echo " }" >> ../node_modules/matrix-react-sdk/res/css/views/emojipicker/_EmojiPicker.scss -echo Adding greentext patch... +echo 'Adding greentext patch...' patch "../node_modules/commonmark/dist/commonmark.js" ./greentext.patch -echo running component index fix... +echo 'running component index fix...' cd ../node_modules/matrix-react-sdk yarn reskindex cd ../../element-web-patches -echo running kick fix... +echo 'running kick fix...' ./fix_kick.sh