From 8676c6705d27c5e6246bb5d4b6732614f5672c98 Mon Sep 17 00:00:00 2001 From: 1024x2 Date: Wed, 14 Aug 2024 01:29:30 +0100 Subject: De-duplicate vextop script --- build.sh | 6 ++++++ vextop.sh | 28 +++------------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/build.sh b/build.sh index 8f550c2..e5e848c 100755 --- a/build.sh +++ b/build.sh @@ -5,6 +5,12 @@ set -euo pipefail # Pull the patches repository git pull +# Emergency Alert System +if [ -e Alert ]; then + cat Alert >&2 + exit 1 +fi + # Do we have the Vencord sources cloned? if [ -e Vencord/.git ]; then # Update sources diff --git a/vextop.sh b/vextop.sh index fa43326..c409173 100755 --- a/vextop.sh +++ b/vextop.sh @@ -2,33 +2,11 @@ set -euo pipefail -# Pull the patches repository -git pull - -# Do we have the Vencord sources cloned? -if [ -e Vencord/.git ]; then - # Update sources - cd Vencord - git fetch -else - # Clone sources - git clone https://github.com/Vendicated/Vencord.git Vencord - cd Vencord -fi - -# Reset vexcord branch and apply patches -git checkout -B vexcord origin/main -git am ../vencord-patches/*.patch - -# Build vencord -pnpm i --frozen-lockfile -node scripts/build/build.mjs +# Build Vencord +./build.sh # Save this for later (Vextop needs it) -export VENCORD_FILES_DIR="$(realpath dist)" - -# Back out of Vencord directory -cd .. +export VENCORD_FILES_DIR="$(realpath Vencord/dist)" # Do we have the Vesktop sources cloned? if [ -e Vesktop/.git ]; then -- cgit v1.2.3