From 9095a54a979cb10060e42f27c6912d56bddafa4c Mon Sep 17 00:00:00 2001 From: f Date: Tue, 15 Mar 2022 13:52:10 -0300 Subject: [PATCH 1/2] =?UTF-8?q?hacer=20autoactualizaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- haini.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/haini.sh b/haini.sh index 657843c..ecf0e17 100755 --- a/haini.sh +++ b/haini.sh @@ -215,6 +215,20 @@ crear_entorno() { test -f "$ENTORNO/usr/local/share/ca-certificates/ca-sutty.crt" || mv "$ENTORNO/etc/ssl/certs/ca-sutty.crt" "$ENTORNO/usr/local/share/ca-certificates/ca-sutty.crt" } +# Auto-actualizar una vez por hora +actualizar() { + last_update="$(find "$DIR/.git/FETCH_HEAD" -mmin +60 | wc -l)" + + if test $last_update -ne 0 && ping -q -c 1 0xacab.org; then + git -C "$DIR" pull --ff-only + + if test "$DIR/.git/FETCH_HEAD" -o "$DIR/.git/ORIG_HEAD"; then + echo "haini.sh se actualizó, por favor volvé a ejecutar el comando" >&2 + exit 0 + fi + fi +} + DEFAULT="sh" case $1 in @@ -246,6 +260,7 @@ else fi fi + actualizar crear_entorno stdin=/dev/stdin correr "${*:-$DEFAULT}" ; salida=$? From 09e732bdc49bfd2d2e3b085e4f49de52c8a46e28 Mon Sep 17 00:00:00 2001 From: Nulo Date: Thu, 17 Mar 2022 15:25:49 +0000 Subject: [PATCH 2/2] Notificar cuando se actualiza o falla --- haini.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/haini.sh b/haini.sh index ecf0e17..11343af 100755 --- a/haini.sh +++ b/haini.sh @@ -219,13 +219,20 @@ crear_entorno() { actualizar() { last_update="$(find "$DIR/.git/FETCH_HEAD" -mmin +60 | wc -l)" - if test $last_update -ne 0 && ping -q -c 1 0xacab.org; then + if test ! $last_update -ne 0; then + return + fi + + echo -n "Actualizando haini.sh... " >&2 + if ping -q -c 1 0xacab.org; then git -C "$DIR" pull --ff-only if test "$DIR/.git/FETCH_HEAD" -o "$DIR/.git/ORIG_HEAD"; then echo "haini.sh se actualizó, por favor volvé a ejecutar el comando" >&2 exit 0 fi + else + echo "no se pudo conectar 0xacab.org, intentando la próxima vez." >&2 fi }