changelog.md

@@ -1,12 +1,5 @@
 # Changelog
 
-## 2025-03-26 - 2.6.2 - fix(setup/readme)
-Improve force update instructions and dependency installation process in setup.sh and readme.md
-
-- Clarify force update commands with explicit paths in readme.md
-- Remove existing node_modules before installing dependencies in setup.sh
-- Switch from 'npm ci --only=production' to 'npm install --omit=dev' with updated error instructions
-
 ## 2025-03-26 - 2.6.1 - fix(setup)
 Update setup.sh to temporarily add vendor Node.js binary to PATH for dependency installation, log Node and npm versions, and restore the original PATH afterwards.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/nupst",
-  "version": "2.6.2",
+  "version": "2.6.1",
   "description": "Node.js UPS Shutdown Tool for SNMP-enabled UPS devices",
   "main": "dist/index.js",
   "bin": {

readme.md

@@ -234,11 +234,7 @@ This will:
 You can also manually run the setup script with the force flag to update Node.js and dependencies without updating the application code:
 
 ```bash
-# If you're in the nupst directory:
-bash ./setup.sh --force
-
-# If you're in another directory, specify the full path:
-bash /opt/nupst/setup.sh --force
+bash setup.sh --force
 ```
 
 ## Security

setup.sh

@@ -244,24 +244,27 @@ NODE_BIN_DIR="$SCRIPT_DIR/vendor/$NODE_DIR/bin"
 OLD_PATH="$PATH"
 export PATH="$NODE_BIN_DIR:$PATH"
 
-# Remove existing node_modules directory
-echo "Removing existing node_modules directory..."
-rm -rf "$SCRIPT_DIR/node_modules"
-
 # Install production dependencies
 echo "Installing production dependencies..."
 echo "Using Node.js binary from: $NODE_BIN_DIR"
 echo "Node version: $(node --version)"
 echo "NPM version: $(npm --version)"
 
-npm --prefix "$SCRIPT_DIR" install --omit=dev --no-audit --no-fund
+npm --prefix "$SCRIPT_DIR" ci --only=production --no-audit --no-fund
 
 if [ $? -ne 0 ]; then
-  echo "Error: Failed to install dependencies. NUPST may not function correctly."
-  echo "You can try to install dependencies manually by running:"
-  echo "cd $SCRIPT_DIR && npm install --omit=dev"
+  echo "Warning: Failed to install dependencies with 'npm ci'. Trying 'npm install'..."
+  npm --prefix "$SCRIPT_DIR" install --only=production --no-audit --no-fund
+  
+  if [ $? -ne 0 ]; then
+    echo "Error: Failed to install dependencies. NUPST may not function correctly."
+    echo "You can try to install dependencies manually by running:"
+    echo "cd $SCRIPT_DIR && npm install --only=production"
+  else
+    echo "Dependencies installed successfully with 'npm install'."
+  fi
 else
-  echo "Dependencies installed successfully."
+  echo "Dependencies installed successfully with 'npm ci'."
 fi
 
 # Restore the original PATH

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/nupst',
-  version: '2.6.2',
+  version: '2.6.1',
   description: 'Node.js UPS Shutdown Tool for SNMP-enabled UPS devices'
 }