tr200 2.0.1 → 2.0.3

package/README.md

@@ -80,45 +80,55 @@ If your system is different, things might break. Look up the offending line and
 npm install -g tr200
 ```
 
-**That's it!** Now you can run:
-
+**Run on-demand:**
 ```bash
 tr200
 # or
 report
 ```
 
-**Requirements:**
-- Node.js 14.0.0 or later
-- bash (Linux/macOS) or PowerShell (Windows)
+**Set up auto-run on terminal startup:**
+```bash
+tr200 --install
+```
+
+**Remove auto-run:**
+```bash
+tr200 --uninstall
+```
+
+**Completely uninstall:**
+```bash
+tr200 --uninstall
+npm uninstall -g tr200
+```
 
-**What this does:**
-- Downloads the TR-200 package from npm
-- Creates global `tr200` and `report` commands
-- Automatically detects your OS and runs the appropriate script
+**Requirements:** Node.js 14.0.0 or later
+
+---
 
-**Note:** The npm version is for on-demand use. If you want TR-200 to auto-run on terminal startup, use one of the install scripts below instead.
+## Quick Reference
+
+| Command | Description |
+|---------|-------------|
+| `tr200` | Run the machine report |
+| `tr200 --help` | Show help |
+| `tr200 --version` | Show version |
+| `tr200 --install` | Set up auto-run on terminal startup |
+| `tr200 --uninstall` | Remove auto-run configuration |
 
 ---
 
-## ⚡ Super Quick Install (install.sh)
+## ⚡ Alternative: install.sh (No Node.js Required)
 
-**Simplest method - fully automated!**
+**For users without Node.js:**
 
 ```bash
 cd ~/git-projects && gh repo clone RealEmmettS/usgc-machine-report && \
 cd RealEmmettS-usgc-machine-report && ./install.sh
 ```
 
-The `install.sh` script handles everything:
-- Detects your OS and architecture
-- Installs dependencies (lastlog2)
-- Backs up existing installations
-- Copies and configures the script
-- Tests everything works
-- Sets up the `report` alias
-
-**That's it! Type `report` or open a new terminal to see it in action.**
+The `install.sh` script handles everything: OS detection, dependency installation, backup, configuration, and auto-run setup.
 
 ---
 
@@ -146,194 +156,16 @@ The script creates `dist/tr-200-machine-report.zip` containing the launchers, `m
 
 ---
 
-## 🤖 Claude Code Automated Installation
-
-**Best for:** Using with [Claude Code](https://claude.ai/code) AI assistant
+## 🤖 Claude Code Installation
 
 Ask Claude Code:
 
 ```
-Install usgc-machine-report from RealEmmettS/usgc-machine-report using install.sh
-```
-
-Or provide these specific instructions:
-
-```bash
-cd ~/git-projects && \
-gh repo clone RealEmmettS/usgc-machine-report && \
-cd RealEmmettS-usgc-machine-report && \
-./install.sh
-```
-
-Claude Code will automatically:
-1. Clone this repository
-2. Install `lastlog2` if on Debian/Raspberry Pi OS
-3. Copy script to `~/.machine_report.sh`
-4. Add to `.bashrc` with automatic run on login
-5. Create convenient `report` alias
-
-**Or provide these specific instructions to Claude Code:**
-
-```bash
-# 1. Clone the repository
-cd ~/git-projects
-gh repo clone RealEmmettS/usgc-machine-report
-
-# 2. Install dependencies (Debian/Ubuntu/Raspberry Pi OS)
-sudo apt install -y lastlog2
-
-# 3. Install the script
-cp ~/git-projects/RealEmmettS-usgc-machine-report/machine_report.sh ~/.machine_report.sh
-chmod +x ~/.machine_report.sh
-
-# 4. Add to .bashrc
-cat >> ~/.bashrc << 'EOF'
-
-# Machine Report alias - run anytime with 'report' command
-alias report='~/.machine_report.sh'
-
-# Run Machine Report only when in interactive mode
-if [[ $- == *i* ]]; then
-    ~/.machine_report.sh
-fi
-EOF
-
-# 5. Test installation
-~/.machine_report.sh
+npm install -g tr200 && tr200 --install
 ```
 
 ---
 
-## 🍎 macOS Installation
-
-**Requirements:**
-- macOS 10.13 (High Sierra) or later
-- Bash 4.0+ recommended (install via `brew install bash`)
-
-**Quick Install:**
-
-```bash
-cd ~/git-projects && gh repo clone RealEmmettS/usgc-machine-report && \
-cd RealEmmettS-usgc-machine-report && ./install.sh
-```
-
-**What works on macOS:**
-- ✅ OS version detection (via `sw_vers`)
-- ✅ CPU info (via `sysctl`)
-- ✅ Memory usage (via `vm_stat`)
-- ✅ Disk usage (via `df`)
-- ✅ Network info (via `scutil`)
-- ✅ System uptime (calculated from boot time)
-- ⚠️ Last login may show "unavailable" (macOS limitation)
-
-**macOS-Specific Notes:**
-- No package installation needed - uses built-in commands
-- Default Bash 3.2 works but Bash 4+ recommended
-- To install newer Bash: `brew install bash`
-- Script automatically detects macOS and uses appropriate commands
-
-### 🐚 zsh Installation (macOS Default Shell)
-
-**Modern macOS (Catalina 10.15+) uses zsh by default**, not bash. If you're using zsh, follow these instructions:
-
-**Quick Install for zsh:**
-
-```bash
-# Clone and install the script
-cd ~/Downloads && git clone https://github.com/RealEmmettS/usgc-machine-report.git && \
-cp ~/Downloads/usgc-machine-report/machine_report.sh ~/.machine_report.sh && \
-chmod +x ~/.machine_report.sh
-
-# Add to .zshrc (not .bashrc!)
-cat >> ~/.zshrc << 'EOF'
-
-# Machine Report alias - run anytime with 'report' command
-alias report='~/.machine_report.sh'
-
-# Run Machine Report only when in interactive mode
-if [[ $- == *i* ]]; then
-    ~/.machine_report.sh
-fi
-EOF
-
-# Clean up cloned repo (optional)
-rm -rf ~/Downloads/usgc-machine-report
-
-echo "✅ Installation complete! Open a new terminal or type: source ~/.zshrc"
-```
-
-**Important zsh Notes:**
-- ✅ Use `~/.zshrc` instead of `~/.bashrc`
-- ✅ The script works identically in zsh - no code changes needed
-- ✅ Test with: `zsh -c "source ~/.zshrc && report"`
-- ℹ️ To check your shell: `echo $SHELL` (should show `/bin/zsh`)
-
----
-
-## 📦 Quick Install (Manual - Raspberry Pi OS / Debian)
-
-**One-liner installation:**
-
-```bash
-cd ~/git-projects && gh repo clone RealEmmettS/usgc-machine-report && \
-sudo apt install -y lastlog2 && \
-cp ~/git-projects/RealEmmettS-usgc-machine-report/machine_report.sh ~/.machine_report.sh && \
-chmod +x ~/.machine_report.sh && \
-cat >> ~/.bashrc << 'EOF'
-
-# Machine Report alias - run anytime with 'report' command
-alias report='~/.machine_report.sh'
-
-# Run Machine Report only when in interactive mode
-if [[ $- == *i* ]]; then
-    ~/.machine_report.sh
-fi
-EOF
-echo "✅ Installation complete! Type 'report' or open a new terminal."
-```
-
-**Step-by-step installation:**
-
-1. **Clone the repository**:
-   ```bash
-   cd ~/git-projects
-   gh repo clone RealEmmettS/usgc-machine-report
-   ```
-
-2. **Install dependencies** (for modern Debian/Raspberry Pi OS):
-   ```bash
-   sudo apt install -y lastlog2
-   ```
-
-   *Note: On systems with the legacy `lastlog` command, this step is optional. The script automatically detects and uses whichever is available.*
-
-3. **Copy the script to your home directory**:
-   ```bash
-   cp ~/git-projects/RealEmmettS-usgc-machine-report/machine_report.sh ~/.machine_report.sh
-   chmod +x ~/.machine_report.sh
-   ```
-
-4. **Add to `.bashrc` for automatic display on login**:
-   ```bash
-   cat >> ~/.bashrc << 'EOF'
-
-# Machine Report alias - run anytime with 'report' command
-alias report='~/.machine_report.sh'
-
-# Run Machine Report only when in interactive mode
-if [[ $- == *i* ]]; then
-    ~/.machine_report.sh
-fi
-EOF
-   ```
-
-5. **Test the installation**:
-   ```bash
-   ~/.machine_report.sh
-   ```
-
----
-
 ## 🛠️ Manual Installation (Advanced)
 
 For login sessions over ssh, reference the script `~/.machine_report.sh` in your `.bashrc` file. Make sure the script is executable by running `chmod +x ~/.machine_report.sh`.
@@ -432,6 +264,24 @@ For ZFS systems, edit:
 
 ## 📝 Changelog (Fork-specific)
 
+### v2.0.1 (2026-01-30) - **INSTALL FLAGS + PS 5.1 FIXES**
+**New CLI Flags + PowerShell Compatibility**
+
+- ✨ **`--install` flag**: Set up auto-run on terminal startup via npm
+- ✨ **`--uninstall` flag**: Remove auto-run configuration cleanly
+- ✨ **`--help` flag**: Show usage information (all scripts)
+- ✨ **`--version` flag**: Show version information (all scripts)
+- 🔧 **PowerShell 5.1 compatibility**: Fixed `[System.Net.Dns]::GetHostName()` and null-conditional operators
+- 📚 **Simplified README**: npm + `--install` promoted as primary installation method
+
+**Upgrade path:**
+```bash
+npm update -g tr200
+tr200 --install  # Re-run to update shell config if needed
+```
+
+---
+
 ### v2.0.0 (2026-01-30) - **SHAUGHV REBRAND + NPM RELEASE**
 **Complete Rebrand + Auto-Run Enhancements + npm Publishing**
 

package/WINDOWS/TR-200-MachineReport.ps1

@@ -460,7 +460,9 @@ function Show-TR200Report {
     }
 
     # Total inner width of table (excluding outer borders)
-    $innerWidth = 2 + $labelWidth + 3 + $dataWidth + 2  # "│ <label> │ <value> │"
+    # Row format: "│ <label> │ <value> │" = 1+1+label+1+1+1+data+1+1 = label+data+7
+    # Inner width is between outer │ chars: " <label> │ <value> " = label+data+5
+    $innerWidth = $labelWidth + $dataWidth + 5
 
     # Convert chars to strings for multiplication (PS 5.1 compatibility)
     $hzLine = [string]$TR200Chars.Horizontal

package/bin/tr200.js

@@ -35,6 +35,63 @@ if (Get-Command tr200 -ErrorAction SilentlyContinue) {
 }
 `;
 
+// All patterns to detect (TR-100 and TR-200 variants)
+const ALL_MARKERS = [
+    'TR-200 Machine Report (npm)',       // npm-installed
+    'TR-200 Machine Report configuration', // install.sh installed
+    'TR-200 Machine Report - run on login', // .profile/.zprofile
+    'TR-200 Machine Report - run on bash login', // .bash_profile
+    'Run Machine Report only when in interactive mode', // TR-100 (original upstream)
+    'TR-100 Machine Report',             // TR-100 header
+    '# Machine Report alias',            // TR-100 alias marker
+];
+
+// Clean a profile file of ALL TR-100/TR-200 entries
+function cleanProfileFile(filePath) {
+    if (!fs.existsSync(filePath)) return false;
+
+    let content = fs.readFileSync(filePath, 'utf8');
+    const originalContent = content;
+
+    // Check if any markers exist
+    const hasMarkers = ALL_MARKERS.some(marker => content.includes(marker));
+    if (!hasMarkers && !content.includes('machine_report')) {
+        return false;
+    }
+
+    // Remove npm-style TR-200 blocks (Unix)
+    content = content.replace(/\n?# TR-200 Machine Report \(npm\) - auto-run\nif command -v tr200 &> \/dev\/null; then\n    tr200\nfi\n?/g, '');
+
+    // Remove npm-style TR-200 blocks (PowerShell)
+    content = content.replace(/\n?# TR-200 Machine Report \(npm\) - auto-run\nif \(Get-Command tr200 -ErrorAction SilentlyContinue\) \{\n    tr200\n\}\n?/g, '');
+
+    // Remove install.sh TR-200 blocks (matches the full block including aliases)
+    content = content.replace(/\n?# TR-200 Machine Report configuration\nalias report=.*\nalias uninstall=.*\n\n?# Auto-run on interactive (?:bash|zsh) shell.*\nif \[\[.*\]\]; then\n    clear\n    ~\/.machine_report\.sh\nfi\n?/g, '');
+
+    // Remove TR-200 login blocks (.profile/.zprofile/.bash_profile)
+    content = content.replace(/\n?# TR-200 Machine Report - run on (?:login|bash login).*\nif \[ -x "\$HOME\/.machine_report\.sh" \]; then\n    clear\n    "\$HOME\/.machine_report\.sh"\nfi\n?/g, '');
+
+    // Remove TR-100 blocks (original upstream pattern)
+    content = content.replace(/\n?# Run Machine Report only when in interactive mode\nif \[\[ \$- == \*i\* \]\]; then\n    ~\/.machine_report\.sh\nfi\n?/g, '');
+
+    // Remove any stray alias lines
+    content = content.replace(/\n?alias report=.*machine_report.*\n?/g, '\n');
+    content = content.replace(/\n?alias uninstall=.*machine_report.*\n?/g, '\n');
+
+    // Remove TR-100 alias marker
+    content = content.replace(/\n?# Machine Report alias\n?/g, '\n');
+
+    // Clean up excessive blank lines (more than 2 consecutive)
+    content = content.replace(/\n{3,}/g, '\n\n');
+    content = content.trim();
+
+    if (content !== originalContent.trim()) {
+        fs.writeFileSync(filePath, content + '\n', 'utf8');
+        return true;
+    }
+    return false;
+}
+
 // Shell profile paths
 function getProfilePaths() {
     if (isWindows) {
@@ -70,13 +127,21 @@ function askConfirmation(question) {
     });
 }
 
-// Check if config already exists in file
+// Check if npm config already exists in file
 function hasConfig(filePath) {
     if (!fs.existsSync(filePath)) return false;
     const content = fs.readFileSync(filePath, 'utf8');
     return content.includes(CONFIG_MARKER);
 }
 
+// Check if ANY TR-100/TR-200 config exists (for cleanup detection)
+function hasAnyConfig(filePath) {
+    if (!fs.existsSync(filePath)) return false;
+    const content = fs.readFileSync(filePath, 'utf8');
+    return ALL_MARKERS.some(marker => content.includes(marker)) ||
+           content.includes('machine_report');
+}
+
 // Install auto-run to shell profiles
 async function installAutoRun() {
     const profiles = getProfilePaths();
@@ -94,11 +159,25 @@ async function installAutoRun() {
         process.exit(0);
     }
 
+    // First, clean up any existing TR-100/TR-200 configurations
+    console.log('Cleaning previous installations...');
+    let cleaned = 0;
+    for (const profilePath of profiles) {
+        if (cleanProfileFile(profilePath)) {
+            console.log(`  [cleaned] ${profilePath}`);
+            cleaned++;
+        }
+    }
+    if (cleaned > 0) {
+        console.log(`  Cleaned ${cleaned} profile(s)`);
+    }
+    console.log('');
+
     let installed = 0;
     let skipped = 0;
 
     for (const profilePath of profiles) {
-        // Check if already configured
+        // Check if already configured (with npm marker specifically)
         if (hasConfig(profilePath)) {
             console.log(`  [skip] ${profilePath} - already configured`);
             skipped++;
@@ -136,7 +215,7 @@ async function uninstallAutoRun() {
     const profiles = getProfilePaths();
 
     console.log('\nTR-200 Machine Report - Remove Auto-Run\n');
-    console.log('This will remove the auto-run configuration from your shell profile(s).');
+    console.log('This will remove ALL TR-100/TR-200 configurations from your shell profile(s).');
     console.log('Profile(s) to check:');
     profiles.forEach(p => console.log(`  - ${p}`));
     console.log('');
@@ -154,27 +233,10 @@ async function uninstallAutoRun() {
             continue;
         }
 
-        const content = fs.readFileSync(profilePath, 'utf8');
-        if (!content.includes(CONFIG_MARKER)) {
-            continue;
-        }
-
-        // Remove the config block (handles both Unix and PowerShell formats)
-        // Match from the comment line through the closing fi/}
-        const unixPattern = /\n?# TR-200 Machine Report \(npm\) - auto-run\nif command -v tr200 &> \/dev\/null; then\n    tr200\nfi\n?/g;
-        const psPattern = /\n?# TR-200 Machine Report \(npm\) - auto-run\nif \(Get-Command tr200 -ErrorAction SilentlyContinue\) \{\n    tr200\n\}\n?/g;
-
-        let newContent = content.replace(unixPattern, '');
-        newContent = newContent.replace(psPattern, '');
-
-        if (newContent !== content) {
-            try {
-                fs.writeFileSync(profilePath, newContent, 'utf8');
-                console.log(`  [done] ${profilePath}`);
-                removed++;
-            } catch (err) {
-                console.error(`  [error] ${profilePath}: ${err.message}`);
-            }
+        // Use the comprehensive cleanup function
+        if (cleanProfileFile(profilePath)) {
+            console.log(`  [done] ${profilePath}`);
+            removed++;
         }
     }
 
@@ -280,7 +342,7 @@ function runReport() {
 // Handle help flag
 if (process.argv.includes('--help') || process.argv.includes('-h')) {
     console.log(`
-TR-200 Machine Report v2.0.1
+TR-200 Machine Report v2.0.3
 
 Usage: tr200 [options]
        report [options]
@@ -300,7 +362,7 @@ More info: https://github.com/RealEmmettS/usgc-machine-report
 
 // Handle version flag
 if (process.argv.includes('--version') || process.argv.includes('-v')) {
-    console.log('2.0.1');
+    console.log('2.0.3');
     process.exit(0);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tr200",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Cross-platform system information report with Unicode box-drawing display",
   "author": "shaughv",
   "license": "BSD-3-Clause",