From 02d2ab1ee759e0abd04894d554678815cc88fc49 Mon Sep 17 00:00:00 2001 From: "Justin (shocknet)" Date: Thu, 15 Aug 2024 21:25:51 -0400 Subject: [PATCH] master --- scripts/extract_nprofile.sh | 6 ++--- scripts/install.sh | 2 +- scripts/install_lightning_pub.sh | 46 ++++++++++++++++---------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/scripts/extract_nprofile.sh b/scripts/extract_nprofile.sh index d71a063b..422105fb 100644 --- a/scripts/extract_nprofile.sh +++ b/scripts/extract_nprofile.sh @@ -46,7 +46,7 @@ get_log_info() { done if [ -z "$latest_entry" ]; then - log "Error: Failed to retrieve wallet status. Please check the service logs." + log "Can't retrieve wallet status, check the service logs." exit 1 fi @@ -88,10 +88,10 @@ get_log_info() { done if [ ! -f "$DATA_DIR/.admin_connect" ] && [ ! -f "$DATA_DIR/app.nprofile" ]; then - log "Error: Neither .admin_connect nor app.nprofile file found after waiting. Please check the service status." + log "Neither .admin_connect nor app.nprofile file found after waiting. Please check the service status." exit 1 elif [ -f "$DATA_DIR/.admin_connect" ] && ! [[ $(cat "$DATA_DIR/.admin_connect") == nprofile1* ]] && ! [[ $(cat "$DATA_DIR/.admin_connect") == *:* ]]; then - log "Error: Admin connect information is incomplete. Please check the service status." + log "Admin connect information is incomplete. Please check the service status." exit 1 fi } \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh index e051cce4..d026ea19 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -27,7 +27,7 @@ log_error() { exit $2 } -BASE_URL="https://raw.githubusercontent.com/shocknet/Lightning.Pub/fix-arm/scripts/" +BASE_URL="https://raw.githubusercontent.com/shocknet/Lightning.Pub/master/scripts/" modules=( "utils" diff --git a/scripts/install_lightning_pub.sh b/scripts/install_lightning_pub.sh index 14f6dbdc..3ef62a84 100755 --- a/scripts/install_lightning_pub.sh +++ b/scripts/install_lightning_pub.sh @@ -11,31 +11,31 @@ install_lightning_pub() { USER_NAME=$(whoami) fi - log "Checking for build essentials..." - if [ "$OS" = "Linux" ]; then - if command -v gcc &> /dev/null && command -v make &> /dev/null; then - log "Build essentials already installed." - else - log "Installing build essentials..." - if command -v apt-get &> /dev/null; then - log "Using apt-get to install build-essential" - sudo apt-get update > /dev/null 2>&1 - sudo apt-get install -y build-essential > /dev/null 2>&1 - elif command -v yum &> /dev/null; then - log "Using yum to install Development Tools" - sudo yum groupinstall -y "Development Tools" > /dev/null 2>&1 - else - log "Unable to install build essentials. Neither apt-get nor yum found." - return 1 - fi - log "Build essentials installation attempt completed." - fi - else - log "Not on Linux, skipping build essentials check." - fi +# log "Checking for build essentials..." +# if [ "$OS" = "Linux" ]; then +# if command -v gcc &> /dev/null && command -v make &> /dev/null; then +# log "Build essentials already installed." +# else +# log "Installing build essentials..." +# if command -v apt-get &> /dev/null; then +# log "Using apt-get to install build-essential" +# sudo apt-get update > /dev/null 2>&1 +# sudo apt-get install -y build-essential > /dev/null 2>&1 +# elif command -v yum &> /dev/null; then +# log "Using yum to install Development Tools" +# sudo yum groupinstall -y "Development Tools" > /dev/null 2>&1 +# else +# log "Unable to install build essentials. Neither apt-get nor yum found." +# return 1 +# fi +# log "Build essentials installation attempt completed." +# fi +# else +# log "Not on Linux, skipping build essentials check." +# fi log "${PRIMARY_COLOR}Installing${RESET_COLOR} ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR}..." - REPO_URL="https://github.com/shocknet/Lightning.Pub/tarball/fix-arm" + REPO_URL="https://github.com/shocknet/Lightning.Pub/tarball/master" sudo -u $USER_NAME wget -q $REPO_URL -O $USER_HOME/lightning_pub.tar.gz > /dev/null 2>&1 || { log "${PRIMARY_COLOR}Failed to download Lightning.Pub.${RESET_COLOR}"