futrou 2.0.8 → 2.0.10

package/install.ps1

@@ -111,7 +111,11 @@ if (-not $downloaded) {
     Invoke-RestMethod -Uri $URL -OutFile $TmpExe
     $downloaded = $true
   } catch {
-    Write-Fail "Could not download $URL`n$_"
+    if ($Version -eq "latest") {
+      Write-Fail "Failed to download latest release. Try again later.`n  $URL"
+    } else {
+      Write-Fail "Version $Version not found or binary not available for $Target.`n  $URL"
+    }
   }
 }
 

package/install.sh

@@ -98,71 +98,103 @@ exe="$bin_dir/futrou$exe_ext"
 
 mkdir -p "$bin_dir" || error "Failed to create install directory \"$bin_dir\""
 
+tildify() {
+  [[ $1 == $HOME/* ]] && echo "~/${1#$HOME/}" || echo "$1"
+}
+
 # ---------------------------------------------------------------------------
-# Detect existing installation and decide action label
+# Detect existing installation
 # ---------------------------------------------------------------------------
-action="Installing"
 current_version=""
-
 if [[ -x "$exe" ]]; then
   current_version=$("$exe" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)
 fi
 
-if [[ -n "$current_version" && "$version" != "latest" ]]; then
-  target_version="${version#v}"
-  if [[ "$current_version" == "$target_version" ]]; then
-    info "Futrou CLI v$current_version is already installed at $exe"
-    exit 0
-  fi
-
-  # Compare semver: split into parts and compare numerically
-  IFS='.' read -r cur_maj cur_min cur_pat <<< "$current_version"
-  IFS='.' read -r tgt_maj tgt_min tgt_pat <<< "$target_version"
+# ---------------------------------------------------------------------------
+# Download to a temp file then atomically replace (avoids "Text file busy"
+# when upgrading a running binary)
+# ---------------------------------------------------------------------------
+tmp_exe="$bin_dir/.futrou-tmp$exe_ext"
 
-  if (( tgt_maj > cur_maj )) || \
-     (( tgt_maj == cur_maj && tgt_min > cur_min )) || \
-     (( tgt_maj == cur_maj && tgt_min == cur_min && tgt_pat > cur_pat )); then
-    action="Upgrading"
+do_download() {
+  local url="$1" dest="$2"
+  if command -v curl >/dev/null 2>&1; then
+    curl --fail --location --silent --output "$dest" "$url"
+  elif command -v wget >/dev/null 2>&1; then
+    wget -q -O "$dest" "$url"
   else
-    action="Downgrading"
+    error "curl or wget is required to install Futrou CLI"
   fi
-elif [[ -n "$current_version" ]]; then
-  action="Upgrading"
-fi
+}
 
-display_version="${version#v}"
+# Spinner shown while downloading
+spinner_pid=""
+if [[ -t 1 ]]; then
+  (
+    frames='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
+    i=0
+    while true; do
+      printf "\r${Dim}%s Checking versions...${Color_Off}" "${frames:$((i % ${#frames})):1}"
+      sleep 0.08
+      (( i++ )) || true
+    done
+  ) &
+  spinner_pid=$!
+else
+  printf "${Dim}Checking versions...${Color_Off}\n"
+fi
 
-if [[ -n "$current_version" ]]; then
+if ! do_download "$download_url" "$tmp_exe"; then
+  [[ -n "$spinner_pid" ]] && kill "$spinner_pid" 2>/dev/null && printf "\r\033[K"
+  rm -f "$tmp_exe"
   if [[ $version == "latest" ]]; then
-    info "$action Futrou CLI v$current_version → latest"
+    error "Failed to download latest release. Try again later.\n  $download_url"
   else
-    info "$action Futrou CLI v$current_version → v$display_version"
+    error "Version $version not found or binary not available for $target.\n  $download_url"
   fi
-else
-  if [[ $version == "latest" ]]; then
-    info "Installing Futrou CLI latest"
+fi
+
+chmod +x "$tmp_exe"
+
+# Stop spinner
+if [[ -n "$spinner_pid" ]]; then
+  kill "$spinner_pid" 2>/dev/null
+  wait "$spinner_pid" 2>/dev/null || true
+  printf "\r\033[K"
+fi
+
+# Read new version from downloaded binary
+new_version=$("$tmp_exe" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || true)
+
+# Already up to date?
+if [[ -n "$current_version" && "$new_version" == "$current_version" ]]; then
+  rm -f "$tmp_exe"
+  success "Futrou CLI is already the latest version v$current_version."
+  exit 0
+fi
+
+# Decide action label now that we know both versions
+action="Installing"
+if [[ -n "$current_version" && -n "$new_version" ]]; then
+  IFS='.' read -r cur_maj cur_min cur_pat <<< "$current_version"
+  IFS='.' read -r new_maj new_min new_pat <<< "$new_version"
+  if (( new_maj > cur_maj )) || \
+     (( new_maj == cur_maj && new_min > cur_min )) || \
+     (( new_maj == cur_maj && new_min == cur_min && new_pat > cur_pat )); then
+    action="Upgrading"
   else
-    info "Installing Futrou CLI v$display_version"
+    action="Downgrading"
   fi
+elif [[ -n "$current_version" ]]; then
+  action="Upgrading"
 fi
 
-# ---------------------------------------------------------------------------
-# Download to a temp file then atomically replace (avoids "Text file busy"
-# when upgrading a running binary)
-# ---------------------------------------------------------------------------
-tmp_exe="$bin_dir/.futrou-tmp$exe_ext"
-
-if command -v curl >/dev/null 2>&1; then
-  curl --fail --location --progress-bar --output "$tmp_exe" "$download_url" ||
-    error "Failed to download from \"$download_url\""
-elif command -v wget >/dev/null 2>&1; then
-  wget -q --show-progress -O "$tmp_exe" "$download_url" ||
-    error "Failed to download from \"$download_url\""
+if [[ -n "$current_version" ]]; then
+  info "$action Futrou CLI v$current_version → v$new_version"
 else
-  error "curl or wget is required to install Futrou CLI"
+  info "Installing Futrou CLI v$new_version"
 fi
 
-chmod +x "$tmp_exe"
 mv -f "$tmp_exe" "$exe"
 
 # ---------------------------------------------------------------------------
@@ -176,7 +208,11 @@ case $action in
   Downgrading) action_past="downgraded" ;;
   *)           action_past="installed"  ;;
 esac
-success "Futrou CLI v$installed_version $action_past to $exe"
+if [[ -n "$current_version" && "$action" != "Installing" ]]; then
+  success "Futrou CLI v$current_version $action_past v$installed_version"
+else
+  success "Futrou CLI v$installed_version $action_past"
+fi
 
 # ---------------------------------------------------------------------------
 # PATH setup (skip if already in PATH)
@@ -187,10 +223,6 @@ if command -v futrou >/dev/null 2>&1; then
   exit 0
 fi
 
-tildify() {
-  [[ $1 == $HOME/* ]] && echo "~/${1#$HOME/}" || echo "$1"
-}
-
 tilde_bin_dir=$(tildify "$bin_dir")
 quoted_install_dir="\"${install_dir//\"/\\\"}\""
 [[ $quoted_install_dir == \"$HOME/* ]] && quoted_install_dir="${quoted_install_dir/$HOME\//\$HOME/}"
@@ -258,7 +290,10 @@ bash)
 esac
 
 echo
-info "To get started, run:"
+info "Reload your shell to use futrou:"
+info_bold "  exec \$SHELL"
+echo
+info "Or open a new terminal and run:"
 info_bold "  futrou --help"
 
 # Make futrou available in the current shell session without restarting

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "futrou",
   "productName": "Futrou CLI",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "Futrou CLI - Deploy and manage Futrou Cloud from your terminal.",
   "bin": {
     "futrou": "./index.cjs",