From e4a9864b6ce72ad3b08691674b995932036fc27e Mon Sep 17 00:00:00 2001 From: "Mauro Rosero P." Date: Sat, 15 Mar 2025 13:50:47 -0500 Subject: [PATCH] [IMPROVED] Estandarizar uso de DEVELOPER_DIR en cversadm_token.sh y base.lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - A帽adir variable global DEVELOPER_DIR=${HOME}/.developer a base.lib - Eliminar definici贸n redundante en cversadm_token.sh y usar la variable global - Actualizar todas las referencias a la variable en las funciones del script - Centralizar definici贸n de la ruta para uso consistente en todo el proyecto 馃 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- bin/cversadm_token.sh | 12 ++++++------ bin/lib/base.lib | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/cversadm_token.sh b/bin/cversadm_token.sh index 483e623..51b096d 100755 --- a/bin/cversadm_token.sh +++ b/bin/cversadm_token.sh @@ -22,7 +22,7 @@ # junto con este programa. Si no la recibi贸, consulte . # Configuraci贸n inicial -DEVELOPERS_DIR="$HOME/.developer" +# Usar DEVELOPER_DIR de base.lib SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # Leer DEVSPATH desde el archivo de configuraci贸n o usar "devs" por defecto @@ -69,10 +69,10 @@ check_sops_installed() { # Funci贸n para asegurar que el directorio .developer existe ensure_developers_dir() { - if [ ! -d "$DEVELOPERS_DIR" ]; then - mkdir -p "$DEVELOPERS_DIR" - chmod 700 "$DEVELOPERS_DIR" - echo "${cvmsg_008} $DEVELOPERS_DIR" + if [ ! -d "$DEVELOPER_DIR" ]; then + mkdir -p "$DEVELOPER_DIR" + chmod 700 "$DEVELOPER_DIR" + echo "${cvmsg_008} $DEVELOPER_DIR" fi } @@ -159,7 +159,7 @@ request_token() { save_token() { local platform=$1 local token=$2 - local filename="${DEVELOPERS_DIR}/${platform}.sops.yaml" + local filename="${DEVELOPER_DIR}/${platform}.sops.yaml" local token_file="/tmp/vcs_token_$$" # Convertir token a base64 para mayor seguridad diff --git a/bin/lib/base.lib b/bin/lib/base.lib index 4eb8322..bff0584 100644 --- a/bin/lib/base.lib +++ b/bin/lib/base.lib @@ -30,6 +30,7 @@ BIN_MESG=${BIN_MESG:=${BIN_BASE}/msg} BIN_LIBS=${BIN_LIBS:=${BIN_BASE}/lib} DEVS_NAME=${CONFPATH}/project.head GIT_IGNORE=.gitignore +DEVELOPER_DIR=${HOME}/.developer DATENOW="$(date +"%Y-%m-%d %H:%M:%S")" DATEBAK="$(date +"%Y%m%d%H%M%S")"