From 4a23dbac896dcf19f65cccb05e4d193b9412d433 Mon Sep 17 00:00:00 2001
From: Israel Paredes <israel.paredes@ugd.gob.mx>
Date: Wed, 19 Jun 2024 03:14:35 +0000
Subject: [PATCH] =?UTF-8?q?C=C3=B3digo=20merge=20de=20upstream=20a=20strep?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/weekly-update.sh | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 scripts/weekly-update.sh

diff --git a/scripts/weekly-update.sh b/scripts/weekly-update.sh
new file mode 100644
index 0000000..8e709cd
--- /dev/null
+++ b/scripts/weekly-update.sh
@@ -0,0 +1,30 @@
+#Es necesario agregar el remoto de core
+#git remote add upstream https://git.libreoffice.org/core
+set -x
+
+pushd night-v2-updates
+git fetch --all --tags
+git merge --abort
+git reset --hard
+git clean -df
+
+git checkout -q -f origin/master
+
+git fetch upstream master
+
+DATE="$(date +%Y-%m-%d)"
+git branch -D actualizacion-master-"$DATE"
+git checkout -b actualizacion-master-"$DATE"
+git merge --no-commit upstream/master
+
+
+if [ "$?" -eq "0" ]; then
+    #hacer push de rama
+    git commit -a -m "actualizacion automatica $DATE"
+    git push origin actualizacion-master-"$DATE"
+else
+    #enviar mensaje de log de error
+    echo "ERR_BOT: No actualizO repositorio"
+fi
+
+popd