From 2592c79844a8a429cb7e130ffd02f901d7d30339 Mon Sep 17 00:00:00 2001 From: fauno Date: Mon, 18 Sep 2023 16:00:37 -0300 Subject: [PATCH] =?UTF-8?q?feat:=20usar=20links=20simb=C3=B3licos=20para?= =?UTF-8?q?=20los=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit al correr `install` siempre van a estar actualizados --- lib/exec/init | 4 ++-- lib/exec/install | 1 + lib/exec/install-script | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/exec/init b/lib/exec/init index f615e4f..f1ae8a2 100755 --- a/lib/exec/init +++ b/lib/exec/init @@ -114,10 +114,10 @@ add_to_file "${conffile}" "GraphDumpFile = /tmp/${NETWORK}.dot" # Copiar los scripts de inicio $verbose && msg "Copiando el resto de archivos..." -install -Dm 750 "${RAP_SKELDIR}/run-script" "${nodedir}/run-script" +ln --symbolic "${RAP_SKELDIR}/run-script" "${nodedir}/run-script" for s in up down ; do - install -Dm 750 "${RAP_SKELDIR}"/tinc-${s} "${nodedir}"/tinc-${s} + ln --symbolic "${RAP_SKELDIR}"/tinc-${s} "${nodedir}"/tinc-${s} done $verbose && msg "Añadiendo hosts..." diff --git a/lib/exec/install b/lib/exec/install index fdfcea2..156092f 100755 --- a/lib/exec/install +++ b/lib/exec/install @@ -50,6 +50,7 @@ ${sudo} rsync -a --no-owner \ --no-group \ --exclude="*.backup" \ --exclude="*~" \ + --copy-unsafe-links \ ${VERBOSE} ${DELETE} ${DRYRUN} \ "${nodedir}/" "${TINC}/" diff --git a/lib/exec/install-script b/lib/exec/install-script index 08f295f..7dfaef3 100755 --- a/lib/exec/install-script +++ b/lib/exec/install-script @@ -67,8 +67,6 @@ test -z "${event}" && fatal_error "El evento %s no es válido" "${event}" for _state in up down; do # No pisar los tinc-{up,down} con run-script if test "${event}" != "tinc" ; then -# Copiar una versión moderna de run-script - cp ${VERBOSE} --force "${RAP_SKELDIR}/run-script" "${node_dir}/" # Y vincularla al evento-estado, de esta forma tenemos una sola copia # siempre actualizada. ln --force --symbolic run-script "${node_dir}/${event}-${_state}" @@ -76,4 +74,4 @@ for _state in up down; do done # Instalar el script para el evento -install -Dm 750 "${script}" "${node_dir}/scripts/${event}-${script##*/}" +ln --symbolic "${script}" "${node_dir}/scripts/${event}-${script##*/}"