From 688033769dada55cfc652504c181c81cd4176b10 Mon Sep 17 00:00:00 2001 From: shocknet-justin Date: Wed, 26 Nov 2025 16:25:43 -0500 Subject: [PATCH] mac restore --- scripts/install_lnd.sh | 8 +++----- scripts/install_nodejs.sh | 7 +++---- scripts/utils.sh | 25 ++++++++++++------------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/scripts/install_lnd.sh b/scripts/install_lnd.sh index 459e7eb4..3a0d47b9 100755 --- a/scripts/install_lnd.sh +++ b/scripts/install_lnd.sh @@ -10,13 +10,11 @@ install_lnd() { USER_NAME=$(whoami) log "Checking latest LND version..." - local api_response=$(download_stdout "https://api.github.com/repos/lightningnetwork/lnd/releases/latest") - LND_VERSION=$(json_value "tag_name" "$api_response") + LND_VERSION=$(get_latest_release_tag "lightningnetwork/lnd") if [ -z "$LND_VERSION" ]; then - # Fallback to a known stable version if GitHub API fails (e.g. rate limit) - LND_VERSION="v0.18.3-beta" - log "${PRIMARY_COLOR}Warning: Failed to fetch latest LND version from GitHub. Using fallback: ${LND_VERSION}${RESET_COLOR}" + log "${PRIMARY_COLOR}Failed to fetch latest LND version.${RESET_COLOR}" + exit 1 fi log "Latest LND version: $LND_VERSION" diff --git a/scripts/install_nodejs.sh b/scripts/install_nodejs.sh index ce1b47eb..da7fe411 100755 --- a/scripts/install_nodejs.sh +++ b/scripts/install_nodejs.sh @@ -13,11 +13,10 @@ install_nodejs() { [ -s "${NVM_DIR}/nvm.sh" ] && \. "${NVM_DIR}/nvm.sh" if ! command -v nvm &> /dev/null; then - local nvm_api=$(download_stdout "https://api.github.com/repos/nvm-sh/nvm/releases/latest") - NVM_VERSION=$(json_value "tag_name" "$nvm_api") + NVM_VERSION=$(get_latest_release_tag "nvm-sh/nvm") if [ -z "$NVM_VERSION" ]; then - NVM_VERSION="v0.39.7" - log "Warning: Failed to fetch latest NVM version. Using fallback: $NVM_VERSION" + log "Failed to fetch latest NVM version." + return 1 fi download_stdout "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" | bash > /dev/null 2>&1 export NVM_DIR="${NVM_DIR}" diff --git a/scripts/utils.sh b/scripts/utils.sh index 30b88fe5..8c820e4a 100755 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -81,28 +81,27 @@ json_value() { download() { local url="$1" local dest="$2" - if command -v wget &> /dev/null; then - wget -q "$url" -O "$dest" - elif command -v curl &> /dev/null; then - # -f: fail on HTTP errors (404/500) - # -s: silent - # -L: follow redirects + if [ "$OS" = "Mac" ]; then curl -fsL "$url" -o "$dest" else - log "Error: Neither wget nor curl found." - return 1 + wget -q "$url" -O "$dest" fi } # Download to stdout (wget or curl) download_stdout() { local url="$1" - if command -v wget &> /dev/null; then - wget -qO- "$url" - elif command -v curl &> /dev/null; then + if [ "$OS" = "Mac" ]; then curl -fsL "$url" else - log "Error: Neither wget nor curl found." - return 1 + wget -qO- "$url" fi +} + +# Get latest release tag from GitHub (via API) +get_latest_release_tag() { + local repo="$1" + local url="https://api.github.com/repos/${repo}/releases/latest" + local api_json=$(download_stdout "$url") + json_value "tag_name" "$api_json" } \ No newline at end of file