trooper-cli 0.1.2 → 0.1.3

package/bin/trooper.js

@@ -111,10 +111,12 @@ function buildLocalMacUninstallCommand({ keepData = false, removeApp = false } =
   return `set -euo pipefail
 export PATH="/opt/homebrew/bin:/usr/local/bin:/Applications/Docker.app/Contents/Resources/bin:$HOME/Applications/Docker.app/Contents/Resources/bin:/usr/bin:/bin:/usr/sbin:/sbin"
 TROOPER_HOME="\${TROOPER_HOME:-$HOME/Library/Application Support/Trooper/runtime}"
-TROOPER_PARENT_DIR="\$(dirname "$TROOPER_HOME")"
+TROOPER_PARENT_DIR="\$(/usr/bin/dirname "$TROOPER_HOME")"
 PLIST_DIR="$HOME/Library/LaunchAgents"
 OPENCLAW_GATEWAY_CONTAINER="\${OPENCLAW_GATEWAY_CONTAINER:-openclaw-openclaw-gateway-1}"
 LABELS=(${labels})
+USER_ID="\$(/usr/bin/id -u)"
+GROUP_ID="\$(/usr/bin/id -g)"
 
 echo "Uninstalling Trooper local host from this Mac..."
 
@@ -126,33 +128,40 @@ for path in "$TROOPER_HOME" "$TROOPER_PARENT_DIR/install-local-host.command" "$P
 done
 if (( \${#ROOT_OWNED_PATHS[@]} > 0 )); then
   echo "Repairing ownership from an earlier Trooper local-host installation..."
-  sudo chown -R "\$(id -u):\$(id -g)" "\${ROOT_OWNED_PATHS[@]}"
+  /usr/bin/sudo /usr/sbin/chown -R "$USER_ID:$GROUP_ID" "\${ROOT_OWNED_PATHS[@]}"
 fi
 
 for label in "\${LABELS[@]}"; do
-  launchctl bootout "gui/\$(id -u)/$label" >/dev/null 2>&1 || true
-  launchctl bootout "gui/\$(id -u)" "$PLIST_DIR/$label.plist" >/dev/null 2>&1 || true
-  rm -f "$PLIST_DIR/$label.plist"
+  /bin/launchctl bootout "gui/$USER_ID/$label" >/dev/null 2>&1 || true
+  /bin/launchctl bootout "gui/$USER_ID" "$PLIST_DIR/$label.plist" >/dev/null 2>&1 || true
+  /bin/rm -f "$PLIST_DIR/$label.plist"
 done
 
-if command -v docker >/dev/null 2>&1; then
-  docker rm -f "$OPENCLAW_GATEWAY_CONTAINER" trooper-local-gateway >/dev/null 2>&1 || true
+DOCKER_BIN=""
+for candidate in /opt/homebrew/bin/docker /usr/local/bin/docker /Applications/Docker.app/Contents/Resources/bin/docker "$HOME/Applications/Docker.app/Contents/Resources/bin/docker"; do
+  if [[ -x "$candidate" ]]; then
+    DOCKER_BIN="$candidate"
+    break
+  fi
+done
+if [[ -n "$DOCKER_BIN" ]]; then
+  "$DOCKER_BIN" rm -f "$OPENCLAW_GATEWAY_CONTAINER" trooper-local-gateway >/dev/null 2>&1 || true
 fi
 
-rm -f "$TROOPER_PARENT_DIR/install-local-host.command" /tmp/trooper-local-mac-host.sh
+/bin/rm -f "$TROOPER_PARENT_DIR/install-local-host.command" /tmp/trooper-local-mac-host.sh
 
 if [[ ${keepData ? '1' : '0'} == "1" ]]; then
-  rm -rf "$TROOPER_HOME/bridge" "$TROOPER_HOME/bin" "$TROOPER_HOME/logs"
-  rm -f "$TROOPER_HOME/trooper-local-host.env"
+  /bin/rm -rf "$TROOPER_HOME/bridge" "$TROOPER_HOME/bin" "$TROOPER_HOME/logs"
+  /bin/rm -f "$TROOPER_HOME/trooper-local-host.env"
   echo "Preserved local Trooper data at: $TROOPER_HOME/openclaw-data"
 else
-  rm -rf "$TROOPER_HOME"
+  /bin/rm -rf "$TROOPER_HOME"
 fi
 
 if [[ ${removeApp ? '1' : '0'} == "1" ]]; then
-  rm -rf "$HOME/Applications/Trooper.app" 2>/dev/null || true
+  /bin/rm -rf "$HOME/Applications/Trooper.app" 2>/dev/null || true
   if [[ -d "/Applications/Trooper.app" ]]; then
-    rm -rf "/Applications/Trooper.app" 2>/dev/null || echo "Trooper.app in /Applications still exists; remove it from Finder or rerun with permission."
+    /bin/rm -rf "/Applications/Trooper.app" 2>/dev/null || echo "Trooper.app in /Applications still exists; remove it from Finder or rerun with permission."
   fi
 fi
 
@@ -185,11 +194,11 @@ async function fetchSetupGuide({ apiUrl, token, platform }) {
   return data;
 }
 
-function runShellCommand(command, platform, { failureLabel = 'Command', successMessage = '' } = {}) {
+function runShellCommand(command, platform, { failureLabel = 'Command', successMessage = '', shell } = {}) {
   const isWindows = platform === 'windows' || process.platform === 'win32';
   const child = isWindows
     ? spawn('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', command], { stdio: 'inherit' })
-    : spawn(process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash', ['-lc', command], { stdio: 'inherit' });
+    : spawn(shell || (process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash'), ['-lc', command], { stdio: 'inherit' });
 
   child.on('error', (error) => {
     console.error(`Could not start ${failureLabel.toLowerCase()}: ${error.message}`);
@@ -241,7 +250,7 @@ async function main() {
       console.log(uninstallCommand);
       return;
     }
-    runShellCommand(uninstallCommand, platform, { failureLabel: 'Uninstall' });
+    runShellCommand(uninstallCommand, platform, { failureLabel: 'Uninstall', shell: '/bin/bash' });
     return;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trooper-cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Trooper local host setup CLI",
   "type": "module",
   "bin": {