From c015bf7991f9048a8ba289664ef114de124b7344 Mon Sep 17 00:00:00 2001 From: shocknet-justin Date: Tue, 26 Aug 2025 14:23:04 -0400 Subject: [PATCH] more sudo removals --- scripts/install_nodejs.sh | 6 +++--- scripts/start_services.sh | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/scripts/install_nodejs.sh b/scripts/install_nodejs.sh index d1700d4f..7a4dfde0 100755 --- a/scripts/install_nodejs.sh +++ b/scripts/install_nodejs.sh @@ -9,7 +9,7 @@ install_nodejs() { USER_NAME=$(whoami) fi - NVM_DIR="$USER_HOME/.nvm" + export NVM_DIR="$USER_HOME/.nvm" log "${PRIMARY_COLOR}Checking${RESET_COLOR} for Node.js..." MINIMUM_VERSION="18.0.0" @@ -19,7 +19,7 @@ install_nodejs() { if ! command -v nvm &> /dev/null; then NVM_VERSION=$(wget -qO- https://api.github.com/repos/nvm-sh/nvm/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")') - sudo -u $USER_NAME bash -c "wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash > /dev/null 2>&1" + wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash > /dev/null 2>&1 export NVM_DIR="${NVM_DIR}" [ -s "${NVM_DIR}/nvm.sh" ] && \. "${NVM_DIR}/nvm.sh" fi @@ -36,7 +36,7 @@ install_nodejs() { log "Node.js is not installed. ${PRIMARY_COLOR}Installing the LTS version...${RESET_COLOR}" fi - if ! sudo -u $USER_NAME bash -c "source ${NVM_DIR}/nvm.sh && nvm install --lts"; then + if ! bash -c "source ${NVM_DIR}/nvm.sh && nvm install --lts"; then log "${PRIMARY_COLOR}Failed to install Node.js.${RESET_COLOR}" return 1 fi diff --git a/scripts/start_services.sh b/scripts/start_services.sh index 98feae0e..f87d1c82 100755 --- a/scripts/start_services.sh +++ b/scripts/start_services.sh @@ -12,10 +12,15 @@ start_services() { USER_NAME=$(whoami) fi + # Ensure NVM_DIR is set + if [ -z "$NVM_DIR" ]; then + export NVM_DIR="$USER_HOME/.nvm" + fi + if [ "$OS" = "Linux" ]; then if [ "$SYSTEMCTL_AVAILABLE" = true ]; then - mkdir -p "$HOME/.config/systemd/user" - cat > "$HOME/.config/systemd/user/lnd.service" < "$USER_HOME/.config/systemd/user/lnd.service" < "$HOME/.config/systemd/user/lightning_pub.service" < "$USER_HOME/.config/systemd/user/lightning_pub.service" <