fix: atomic install/update, safe uninstall, spinner errors, theme timeout

Author: emylfy

common.sh

@@ -39,13 +39,28 @@ _detect_theme() {
 
     # 2. Query terminal background via OSC 11 (iTerm2, Ghostty, Kitty, WezTerm)
     if [[ -t 2 ]] && [[ -r /dev/tty ]]; then
-        local old_stty response=""
+        local old_stty response="" _dd_pid _timer_pid
+        local _dd_tmp
+        _dd_tmp=$(mktemp)
         old_stty=$(stty -g </dev/tty 2>/dev/null) || true
         stty raw -echo min 0 time 2 </dev/tty 2>/dev/null
         printf '\033]11;?\a' > /dev/tty 2>/dev/null
-        response=$(dd bs=1 count=30 </dev/tty 2>/dev/null) || true
+        # Read with kill-timer to prevent hang in non-standard terminals
+        dd bs=1 count=30 </dev/tty >"$_dd_tmp" 2>/dev/null &
+        _dd_pid=$!
+        (sleep 1 && kill "$_dd_pid" 2>/dev/null) &
+        _timer_pid=$!
+        wait "$_dd_pid" 2>/dev/null
+        kill "$_timer_pid" 2>/dev/null; wait "$_timer_pid" 2>/dev/null
+        response=$(cat "$_dd_tmp")
+        rm -f "$_dd_tmp"
         # Drain any leftover bytes from terminal response
-        dd bs=1 count=64 </dev/tty >/dev/null 2>&1 || true
+        dd bs=1 count=64 </dev/tty >/dev/null 2>&1 &
+        _dd_pid=$!
+        (sleep 1 && kill "$_dd_pid" 2>/dev/null) &
+        _timer_pid=$!
+        wait "$_dd_pid" 2>/dev/null
+        kill "$_timer_pid" 2>/dev/null; wait "$_timer_pid" 2>/dev/null
         stty "$old_stty" </dev/tty 2>/dev/null
         if [[ "$response" =~ rgb:([0-9a-fA-F]+)/([0-9a-fA-F]+)/([0-9a-fA-F]+) ]]; then
             local r=$((16#${BASH_REMATCH[1]:0:2}))
@@ -130,10 +145,17 @@ spinner() {
 run_with_spinner() {
     local msg="$1"
     shift
-    "$@" &>/dev/null &
+    local _rws_log
+    _rws_log=$(mktemp)
+    "$@" &>"$_rws_log" &
     spinner $! "$msg"
     wait $! 2>/dev/null
-    return $?
+    local rc=$?
+    if [[ $rc -ne 0 ]]; then
+        cat "$_rws_log" >&2
+    fi
+    rm -f "$_rws_log"
+    return $rc
 }
 
 # Progress bar — inline redraw
@@ -1056,15 +1078,16 @@ macrift_update() {
     local tmp
     tmp="$(mktemp -d)"
     if curl -fsSL "$MACRIFT_REPO_TAR" | tar -xz -C "$tmp" && [[ -d "$tmp/macrift-main" ]]; then
-        rm -rf "$MACRIFT_DIR"
+        # Atomic swap: backup old → move new → remove backup
+        mv "$MACRIFT_DIR" "$MACRIFT_DIR.bak"
         if mv "$tmp/macrift-main" "$MACRIFT_DIR"; then
             chmod +x "$MACRIFT_DIR/macrift.sh"
             find "$MACRIFT_DIR" -name "*.sh" -exec chmod +x {} +
+            rm -rf "$MACRIFT_DIR.bak"
             log_ok "Updated to $(cat "$MACRIFT_DIR/VERSION" 2>/dev/null || echo 'latest')"
         else
             log_err "Failed to replace install directory"
-            # Restore from tmp if possible
-            [[ -d "$tmp/macrift-main" ]] && mv "$tmp/macrift-main" "$MACRIFT_DIR"
+            mv "$MACRIFT_DIR.bak" "$MACRIFT_DIR"
             rm -rf "$tmp"
             return 1
         fi

install.sh

@@ -38,8 +38,16 @@ printf '\n  %bmacrift installer%b\n\n' "$BOLD" "$RESET"
 info "Downloading macrift..."
 tmp="$(mktemp -d)"
 if curl -fsSL "$REPO_TAR" | tar -xz -C "$tmp"; then
-    [[ -d "$INSTALL_DIR" ]] && rm -rf "$INSTALL_DIR"
-    mv "$tmp/macrift-main" "$INSTALL_DIR"
+    # Atomic swap: backup old → move new → remove backup
+    [[ -d "$INSTALL_DIR" ]] && mv "$INSTALL_DIR" "$INSTALL_DIR.bak"
+    if mv "$tmp/macrift-main" "$INSTALL_DIR"; then
+        rm -rf "$INSTALL_DIR.bak"
+    else
+        err "Failed to move files into place"
+        [[ -d "$INSTALL_DIR.bak" ]] && mv "$INSTALL_DIR.bak" "$INSTALL_DIR"
+        rm -rf "$tmp"
+        exit 1
+    fi
     rm -rf "$tmp"
     ok "Downloaded → $INSTALL_DIR"
 else
@@ -69,8 +77,8 @@ else
 
         if [[ ":$PATH:" != *":$LOCAL_BIN:"* ]]; then
             local_zshrc="$HOME/.zshrc"
-            path_line='export PATH="$HOME/.local/bin:$PATH"'
-            if ! grep -qF '.local/bin' "$local_zshrc" 2>/dev/null; then
+            path_line='export PATH="$HOME/.local/bin:$PATH" # added by macrift'
+            if ! grep -qF '# added by macrift' "$local_zshrc" 2>/dev/null; then
                 printf '\n%s\n' "$path_line" >> "$local_zshrc"
                 ok "Added ~/.local/bin to PATH in .zshrc"
             fi

macrift.sh

@@ -26,7 +26,7 @@ for arg in "$@"; do
                 rm -f "$HOME/.local/bin/macrift"
                 [[ -L "/usr/local/bin/macrift" ]] && sudo rm -f "/usr/local/bin/macrift"
                 if [[ -f "$HOME/.zshrc" ]]; then
-                    sed -i '' '/\.local\/bin/d' "$HOME/.zshrc" 2>/dev/null || true
+                    sed -i '' '/# added by macrift/d' "$HOME/.zshrc" 2>/dev/null || true
                 fi
                 printf '  Done. macrift removed.\n\n'
             fi
@@ -45,7 +45,9 @@ done
 
 # Resolve symlink — global 'macrift' command is a symlink to this file
 MACRIFT_ENTRY="${BASH_SOURCE[0]}"
-[[ -L "$MACRIFT_ENTRY" ]] && MACRIFT_ENTRY="$(readlink "$MACRIFT_ENTRY")"
+while [[ -L "$MACRIFT_ENTRY" ]]; do
+    MACRIFT_ENTRY="$(readlink "$MACRIFT_ENTRY")"
+done
 source "$(cd "$(dirname "$MACRIFT_ENTRY")" && pwd)/common.sh"
 
 # Init log file