diff --git a/scripts/install_lightning_pub.sh b/scripts/install_lightning_pub.sh index 05ee5181..708c43ff 100755 --- a/scripts/install_lightning_pub.sh +++ b/scripts/install_lightning_pub.sh @@ -1,7 +1,6 @@ #!/bin/bash install_lightning_pub() { - local upgrade_status=0 if [ "$EUID" -eq 0 ]; then @@ -36,7 +35,7 @@ install_lightning_pub() { fi log "${PRIMARY_COLOR}Installing${RESET_COLOR} ${SECONDARY_COLOR}Lightning.Pub${RESET_COLOR}..." - REPO_URL="https://github.com/shocknet/Lightning.Pub/tarball/master" + REPO_URL="https://github.com/shocknet/Lightning.Pub/tarball/fix-arm" 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}" @@ -86,16 +85,6 @@ install_lightning_pub() { return 1 fi - if [ ! -d "node_modules" ] || [ -z "$(ls -A node_modules)" ]; then - log "${PRIMARY_COLOR}npm install completed, but node_modules is empty or missing. Installation may have failed.${RESET_COLOR}" - log "Checking npm_install.log for errors:" - grep -i "error" npm_install.log | tail -n 10 | while IFS= read -r line; do - log " $line" - done - log "${PRIMARY_COLOR}Full log available in $USER_HOME/lightning_pub/npm_install.log${RESET_COLOR}" - return 1 - fi - log "npm dependencies installed successfully." return 0 diff --git a/scripts/install_nodejs.sh b/scripts/install_nodejs.sh index f88b6356..d1700d4f 100755 --- a/scripts/install_nodejs.sh +++ b/scripts/install_nodejs.sh @@ -26,10 +26,8 @@ install_nodejs() { if command -v node &> /dev/null; then NODE_VERSION=$(node -v | sed 's/v//') - log "Current Node.js version: $NODE_VERSION" if [ "$(printf '%s\n' "$MINIMUM_VERSION" "$NODE_VERSION" | sort -V | head -n1)" = "$MINIMUM_VERSION" ]; then log "Node.js is already installed and meets the minimum version requirement." - log "Exiting install_nodejs function with status 0" return 0 else log "${PRIMARY_COLOR}Updating${RESET_COLOR} Node.js to the LTS version..." @@ -38,14 +36,11 @@ install_nodejs() { log "Node.js is not installed. ${PRIMARY_COLOR}Installing the LTS version...${RESET_COLOR}" fi - log "Attempting to install/update Node.js..." if ! sudo -u $USER_NAME bash -c "source ${NVM_DIR}/nvm.sh && nvm install --lts"; then log "${PRIMARY_COLOR}Failed to install Node.js.${RESET_COLOR}" - log "Exiting install_nodejs function with status 1" return 1 fi log "Node.js LTS installation completed." - log "Exiting install_nodejs function with status 0" return 0 } \ No newline at end of file