fix(install): correct installation order for updates

- Stop service first
- Remove /opt/nupst
- Create fresh directory
- Download binary
- Ensures clean installation without leaving empty directories

deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@serve.zone/nupst",
-  "version": "4.3.2",
+  "version": "5.0.4",
   "exports": "./mod.ts",
   "tasks": {
     "dev": "deno run --allow-all mod.ts",

install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# NUPST Installer Script (v4.0+)
+# NUPST Installer Script (v5.0+)
 # Downloads and installs pre-compiled NUPST binary from Gitea releases
 #
 # Usage:
@@ -8,7 +8,7 @@
 #     curl -sSL https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh | sudo bash
 #
 #   With version specification:
-#     curl -sSL https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh | sudo bash -s -- --version v4.0.0
+#     curl -sSL https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh | sudo bash -s -- --version v5.0.0
 #
 # Options:
 #   -h, --help             Show this help message
@@ -48,14 +48,14 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [ $SHOW_HELP -eq 1 ]; then
-  echo "NUPST Installer Script (v4.0+)"
+  echo "NUPST Installer Script (v5.0+)"
   echo "Downloads and installs pre-compiled NUPST binary"
   echo ""
   echo "Usage: $0 [options]"
   echo ""
   echo "Options:"
   echo "  -h, --help             Show this help message"
-  echo "  --version VERSION      Install specific version (e.g., v4.0.0)"
+  echo "  --version VERSION      Install specific version (e.g., v5.0.0)"
   echo "  --install-dir DIR      Installation directory (default: /opt/nupst)"
   echo ""
   echo "Examples:"
@@ -63,7 +63,7 @@ if [ $SHOW_HELP -eq 1 ]; then
   echo "  curl -sSL https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh | sudo bash"
   echo ""
   echo "  # Install specific version"
-  echo "  curl -sSL https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh | sudo bash -s -- --version v4.0.0"
+  echo "  curl -sSL https://code.foss.global/serve.zone/nupst/raw/branch/main/install.sh | sudo bash -s -- --version v5.0.0"
   exit 0
 fi
 
@@ -145,7 +145,7 @@ get_latest_version() {
 
 # Main installation process
 echo "================================================"
-echo "  NUPST Installation Script (v4.0+)"
+echo "  NUPST Installation Script (v5.0+)"
 echo "================================================"
 echo ""
 
@@ -169,51 +169,26 @@ DOWNLOAD_URL="${GITEA_BASE_URL}/${GITEA_REPO}/releases/download/${VERSION}/${BIN
 echo "Download URL: $DOWNLOAD_URL"
 echo ""
 
-# Check if installation directory exists
+# Check if service is running and stop it
 SERVICE_WAS_RUNNING=0
-OLD_NODE_INSTALL=0
-
-if [ -d "$INSTALL_DIR" ]; then
-  # Check if this is an old Node.js-based installation
-  if [ -f "$INSTALL_DIR/package.json" ] || [ -d "$INSTALL_DIR/node_modules" ]; then
-    OLD_NODE_INSTALL=1
-    echo "Detected old Node.js-based NUPST installation (v3.x or earlier)"
-    echo "This installer will migrate to the new Deno-based binary version (v4.0+)"
-    echo ""
-  fi
-
-  echo "Updating existing installation at $INSTALL_DIR..."
-
-  # Check if service exists (enabled or running) and stop it if active
-  if systemctl is-enabled --quiet nupst 2>/dev/null || systemctl is-active --quiet nupst 2>/dev/null; then
+if systemctl is-enabled --quiet nupst 2>/dev/null || systemctl is-active --quiet nupst 2>/dev/null; then
   SERVICE_WAS_RUNNING=1
   if systemctl is-active --quiet nupst 2>/dev/null; then
     echo "Stopping NUPST service..."
     systemctl stop nupst
-    else
-      echo "Service is installed but not currently running (will be updated)..."
   fi
-  fi
-
-  # Clean up old Node.js installation files
-  if [ $OLD_NODE_INSTALL -eq 1 ]; then
-    echo "Cleaning up old Node.js installation files..."
-    rm -rf "$INSTALL_DIR/node_modules" 2>/dev/null || true
-    rm -rf "$INSTALL_DIR/vendor" 2>/dev/null || true
-    rm -rf "$INSTALL_DIR/dist_ts" 2>/dev/null || true
-    rm -f "$INSTALL_DIR/package.json" 2>/dev/null || true
-    rm -f "$INSTALL_DIR/package-lock.json" 2>/dev/null || true
-    rm -f "$INSTALL_DIR/pnpm-lock.yaml" 2>/dev/null || true
-    rm -f "$INSTALL_DIR/tsconfig.json" 2>/dev/null || true
-    rm -f "$INSTALL_DIR/setup.sh" 2>/dev/null || true
-    rm -rf "$INSTALL_DIR/bin" 2>/dev/null || true
-    echo "Old installation files removed."
-  fi
-else
-  echo "Creating installation directory: $INSTALL_DIR"
-  mkdir -p "$INSTALL_DIR"
 fi
 
+# Clean installation directory - ensure only binary exists
+if [ -d "$INSTALL_DIR" ]; then
+  echo "Cleaning installation directory: $INSTALL_DIR"
+  rm -rf "$INSTALL_DIR"
+fi
+
+# Create fresh installation directory
+echo "Creating installation directory: $INSTALL_DIR"
+mkdir -p "$INSTALL_DIR"
+
 # Download binary
 echo "Downloading NUPST binary..."
 TEMP_FILE="$INSTALL_DIR/nupst.download"
@@ -260,14 +235,6 @@ echo "Symlink created: $BIN_DIR/nupst -> $BINARY_PATH"
 
 echo ""
 
-# Update systemd service file if migrating from v3
-if [ $SERVICE_WAS_RUNNING -eq 1 ] && [ $OLD_NODE_INSTALL -eq 1 ]; then
-  echo "Updating systemd service file for v4..."
-  $BINARY_PATH service enable > /dev/null 2>&1
-  echo "Service file updated."
-  echo ""
-fi
-
 # Restart service if it was running before update
 if [ $SERVICE_WAS_RUNNING -eq 1 ]; then
   echo "Restarting NUPST service..."
@@ -280,20 +247,6 @@ echo "================================================"
 echo "  NUPST Installation Complete!"
 echo "================================================"
 echo ""
-
-if [ $OLD_NODE_INSTALL -eq 1 ]; then
-  echo "Migration from v3.x to v4.0 successful!"
-  echo ""
-  echo "What changed:"
-  echo "  • Node.js runtime removed (now a self-contained binary)"
-  echo "  • Faster startup and lower memory usage"
-  echo "  • CLI commands now use subcommand structure"
-  echo "    (old commands still work with deprecation warnings)"
-  echo ""
-  echo "See readme for migration details: https://code.foss.global/serve.zone/nupst#migration-from-v3x"
-  echo ""
-fi
-
 echo "Installation details:"
 echo "  Binary location: $BINARY_PATH"
 echo "  Symlink location: $BIN_DIR/nupst"

ts/actions/script-action.ts

@@ -1,5 +1,6 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs';
+import process from 'node:process';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import { Action, type IActionConfig, type IActionContext } from './base-action.ts';

ts/cli.ts

@@ -127,8 +127,7 @@ export class NupstCli {
           break;
         }
         case 'remove':
-        case 'rm': // Alias
-        case 'delete': { // Backward compatibility
+        case 'rm': {
           const upsIdToRemove = subcommandArgs[0];
           if (!upsIdToRemove) {
             logger.error('UPS ID is required for remove command');
@@ -172,8 +171,7 @@ export class NupstCli {
           break;
         }
         case 'remove':
-        case 'rm': // Alias
-        case 'delete': { // Backward compatibility
+        case 'rm': {
           const groupIdToRemove = subcommandArgs[0];
           if (!groupIdToRemove) {
             logger.error('Group ID is required for remove command');
@@ -206,8 +204,7 @@ export class NupstCli {
           break;
         }
         case 'remove':
-        case 'rm': // Alias
-        case 'delete': { // Backward compatibility
+        case 'rm': {
           const upsId = subcommandArgs[0];
           const actionIndex = subcommandArgs[1];
           await actionHandler.remove(upsId, actionIndex);
@@ -242,72 +239,8 @@ export class NupstCli {
       return;
     }
 
-    // Handle top-level commands and backward compatibility
+    // Handle top-level commands
     switch (command) {
-      // Backward compatibility - old UPS commands
-      case 'add':
-        logger.log("Note: 'nupst add' is deprecated. Use 'nupst ups add' instead.");
-        await upsHandler.add();
-        break;
-      case 'edit':
-        logger.log("Note: 'nupst edit' is deprecated. Use 'nupst ups edit' instead.");
-        await upsHandler.edit(commandArgs[0]);
-        break;
-      case 'delete':
-        logger.log("Note: 'nupst delete' is deprecated. Use 'nupst ups remove' instead.");
-        if (!commandArgs[0]) {
-          logger.error('UPS ID is required for delete command');
-          this.showHelp();
-          return;
-        }
-        await upsHandler.remove(commandArgs[0]);
-        break;
-      case 'list':
-        logger.log("Note: 'nupst list' is deprecated. Use 'nupst ups list' instead.");
-        await upsHandler.list();
-        break;
-      case 'test':
-        logger.log("Note: 'nupst test' is deprecated. Use 'nupst ups test' instead.");
-        await upsHandler.test(debugMode);
-        break;
-      case 'setup':
-        logger.log("Note: 'nupst setup' is deprecated. Use 'nupst ups edit' instead.");
-        await upsHandler.edit(undefined);
-        break;
-
-      // Backward compatibility - old service commands
-      case 'enable':
-        logger.log("Note: 'nupst enable' is deprecated. Use 'nupst service enable' instead.");
-        await serviceHandler.enable();
-        break;
-      case 'disable':
-        logger.log("Note: 'nupst disable' is deprecated. Use 'nupst service disable' instead.");
-        await serviceHandler.disable();
-        break;
-      case 'start':
-        logger.log("Note: 'nupst start' is deprecated. Use 'nupst service start' instead.");
-        await serviceHandler.start();
-        break;
-      case 'stop':
-        logger.log("Note: 'nupst stop' is deprecated. Use 'nupst service stop' instead.");
-        await serviceHandler.stop();
-        break;
-      case 'status':
-        logger.log("Note: 'nupst status' is deprecated. Use 'nupst service status' instead.");
-        await serviceHandler.status();
-        break;
-      case 'logs':
-        logger.log("Note: 'nupst logs' is deprecated. Use 'nupst service logs' instead.");
-        await serviceHandler.logs();
-        break;
-      case 'daemon-start':
-        logger.log(
-          "Note: 'nupst daemon-start' is deprecated. Use 'nupst service start-daemon' instead.",
-        );
-        await serviceHandler.daemonStart(debugMode);
-        break;
-
-      // Top-level commands (no changes)
       case 'update':
         await serviceHandler.update();
         break;
@@ -589,11 +522,6 @@ export class NupstCli {
     logger.dim('  nupst group list         # Show all configured groups');
     logger.dim('  nupst config             # Display current configuration');
     console.log('');
-
-    // Note about deprecated commands
-    logger.warn('Note: Old command format (e.g., \'nupst add\') still works but is deprecated.');
-    logger.dim('      Use the new format (e.g., \'nupst ups add\') going forward.');
-    console.log('');
   }
 
   /**
@@ -692,7 +620,7 @@ Usage:
 
 Subcommands:
   add <ups-id|group-id>                   - Add a new action to a UPS or group interactively
-  remove <ups-id|group-id> <index>        - Remove an action by index (alias: rm, delete)
+  remove <ups-id|group-id> <index>        - Remove an action by index (alias: rm)
   list [ups-id|group-id]                  - List all actions (optionally for specific target) (alias: ls)
 
 Options:

ts/systemd.ts

@@ -277,6 +277,9 @@ WantedBy=multi-user.target
         for (const ups of config.upsDevices) {
           await this.displaySingleUpsStatus(ups, snmp);
         }
+
+        // Display groups after UPS devices
+        this.displayGroupsStatus();
       } else if (config.snmp) {
         // Legacy single UPS configuration (v1/v2 format)
         logger.info('UPS Devices (1):');
@@ -365,6 +368,27 @@ WantedBy=multi-user.target
         logger.log(`    ${theme.dim(`Groups: ${groupNames.join(', ')}`)}`);
       }
 
+      // Display actions if any
+      if (ups.actions && ups.actions.length > 0) {
+        for (const action of ups.actions) {
+          let actionDesc = `${action.type}`;
+          if (action.thresholds) {
+            actionDesc += ` (${action.triggerMode || 'onlyThresholds'}: battery<${action.thresholds.battery}%, runtime<${action.thresholds.runtime}min`;
+            if (action.shutdownDelay) {
+              actionDesc += `, delay=${action.shutdownDelay}s`;
+            }
+            actionDesc += ')';
+          } else {
+            actionDesc += ` (${action.triggerMode || 'onlyPowerChanges'}`;
+            if (action.shutdownDelay) {
+              actionDesc += `, delay=${action.shutdownDelay}s`;
+            }
+            actionDesc += ')';
+          }
+          logger.log(`    ${theme.dim('Action:')} ${theme.info(actionDesc)}`);
+        }
+      }
+
       logger.log('');
 
     } catch (error) {
@@ -376,6 +400,69 @@ WantedBy=multi-user.target
     }
   }
 
+  /**
+   * Display status of all groups
+   * @private
+   */
+  private displayGroupsStatus(): void {
+    const config = this.daemon.getConfig();
+
+    if (!config.groups || config.groups.length === 0) {
+      return; // No groups to display
+    }
+
+    logger.log('');
+    logger.info(`Groups (${config.groups.length}):`);
+
+    for (const group of config.groups) {
+      // Display group name and mode
+      const modeColor = group.mode === 'redundant' ? theme.success : theme.warning;
+      logger.log(
+        `  ${symbols.info} ${theme.highlight(group.name)} ${theme.dim(`(${modeColor(group.mode)})`)}`,
+      );
+
+      // Display description if present
+      if (group.description) {
+        logger.log(`    ${theme.dim(group.description)}`);
+      }
+
+      // Display UPS devices in this group
+      const upsInGroup = config.upsDevices.filter((ups) =>
+        ups.groups && ups.groups.includes(group.id)
+      );
+
+      if (upsInGroup.length > 0) {
+        const upsNames = upsInGroup.map((ups) => ups.name).join(', ');
+        logger.log(`    ${theme.dim(`UPS Devices (${upsInGroup.length}):`)} ${upsNames}`);
+      } else {
+        logger.log(`    ${theme.dim('UPS Devices: None')}`);
+      }
+
+      // Display actions if any
+      if (group.actions && group.actions.length > 0) {
+        for (const action of group.actions) {
+          let actionDesc = `${action.type}`;
+          if (action.thresholds) {
+            actionDesc += ` (${action.triggerMode || 'onlyThresholds'}: battery<${action.thresholds.battery}%, runtime<${action.thresholds.runtime}min`;
+            if (action.shutdownDelay) {
+              actionDesc += `, delay=${action.shutdownDelay}s`;
+            }
+            actionDesc += ')';
+          } else {
+            actionDesc += ` (${action.triggerMode || 'onlyPowerChanges'}`;
+            if (action.shutdownDelay) {
+              actionDesc += `, delay=${action.shutdownDelay}s`;
+            }
+            actionDesc += ')';
+          }
+          logger.log(`    ${theme.dim('Action:')} ${theme.info(actionDesc)}`);
+        }
+      }
+
+      logger.log('');
+    }
+  }
+
   /**
    * Disable and uninstall the systemd service
    * @throws Error if disabling fails