Clean up installer

Author: foresturquhart

install.sh

@@ -8,6 +8,14 @@ TMP_DIR="$(mktemp -d)"
 LATEST_RELEASE_URL="https://api.github.com/repos/${GITHUB_REPO}/releases/latest"
 USER_AGENT="Grimoire-Installer-Script"
 
+cleanup() {
+  echo "Cleaning up temporary files..."
+  rm -rf "${TMP_DIR}"
+}
+
+# Set up trap to clean up on exit
+trap cleanup EXIT
+
 # Detect OS and architecture
 OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
 ARCH="$(uname -m)"
@@ -28,8 +36,17 @@ esac
 
 # Handle OS-specific variations
 case "${OS}" in
-  darwin|linux|windows)
-    # These operating systems are supported
+  darwin)
+    OS="darwin"
+    EXT="tar.gz"
+    ;;
+  linux)
+    OS="linux"
+    EXT="tar.gz"
+    ;;
+  windows*)
+    OS="windows"
+    EXT="zip"
     ;;
   *)
     echo "Unsupported operating system: ${OS}"
@@ -42,68 +59,116 @@ echo "Detected OS: ${OS}, Architecture: ${ARCH}"
 # Fetch the latest release information
 echo "Fetching latest release information..."
 RELEASE_INFO=$(curl -s -H "User-Agent: ${USER_AGENT}" "${LATEST_RELEASE_URL}")
-VERSION=$(echo "${RELEASE_INFO}" | grep -o '"tag_name": *"[^"]*"' | grep -o '[^"]*$')
+VERSION=$(echo "${RELEASE_INFO}" | grep -o '"tag_name":"[^"]*"' | sed -E 's/"tag_name":"([^"]*)"/\1/')
 
-# Construct download URL
-if [ "${OS}" = "windows" ]; then
-  ARCHIVE_FORMAT="zip"
-else
-  ARCHIVE_FORMAT="tar.gz"
+if [ -z "${VERSION}" ]; then
+  echo "Error: Could not extract version from release info."
+  exit 1
 fi
 
-DOWNLOAD_URL="https://github.com/${GITHUB_REPO}/releases/download/${VERSION}/grimoire-${VERSION#v}-${OS}-${ARCH}.${ARCHIVE_FORMAT}"
-echo "Downloading Grimoire ${VERSION} for ${OS}-${ARCH}..."
+echo "Latest version: ${VERSION}"
+
+# Create asset name pattern based on the naming convention in .goreleaser.yml
+ASSET_NAME="grimoire-${VERSION#v}-${OS}-${ARCH}.${EXT}"
+echo "Looking for asset: ${ASSET_NAME}"
+
+# Extract the download URL for the specific asset
+DOWNLOAD_URL=$(echo "${RELEASE_INFO}" | grep -o "\"browser_download_url\":\"[^\"]*${ASSET_NAME}\"" | sed -E 's/"browser_download_url":"([^"]*)"/\1/')
+
+if [ -z "${DOWNLOAD_URL}" ]; then
+  echo "Error: Could not find download URL for ${ASSET_NAME}."
+  echo "Available assets:"
+  echo "${RELEASE_INFO}" | grep -o '"browser_download_url":"[^"]*"' | sed -E 's/"browser_download_url":"([^"]*)"/\1/'
+  exit 1
+fi
+
+echo "Download URL: ${DOWNLOAD_URL}"
 
-# Download the binary
-curl -L -s -o "${TMP_DIR}/grimoire.${ARCHIVE_FORMAT}" "${DOWNLOAD_URL}"
+# Create a temporary directory for downloading and extracting
+echo "Downloading Grimoire ${VERSION} for ${OS}-${ARCH}..."
+curl -L -o "${TMP_DIR}/${ASSET_NAME}" "${DOWNLOAD_URL}"
 
-# Extract the binary
-echo "Extracting..."
+# Extract the archive
+echo "Extracting archive..."
 cd "${TMP_DIR}"
-if [ "${ARCHIVE_FORMAT}" = "zip" ]; then
-  unzip -q "grimoire.${ARCHIVE_FORMAT}"
+if [ "${EXT}" = "zip" ]; then
+  unzip -q "${ASSET_NAME}"
 else
-  tar -xzf "grimoire.${ARCHIVE_FORMAT}"
+  tar -xzf "${ASSET_NAME}"
 fi
 
 # Find the binary in the extracted directory
-BINARY_PATH=$(find . -type f -name "grimoire" -o -name "grimoire.exe" | head -n 1)
+# According to .goreleaser.yml, it should be in a directory with the same name as the project
+cd grimoire-*
+BINARY_PATH="grimoire"
+if [ "${OS}" = "windows" ]; then
+  BINARY_PATH="grimoire.exe"
+fi
 
-if [ -z "${BINARY_PATH}" ]; then
-  echo "Error: Could not find grimoire binary in the downloaded archive."
+if [ ! -f "${BINARY_PATH}" ]; then
+  echo "Error: Could not find grimoire binary in the extracted archive."
+  find . -type f | sort
   exit 1
 fi
 
-# If running as root, install to system directory
+# Installation logic based on permissions
 if [ "$(id -u)" -eq 0 ]; then
-  # Install to system-wide directory
+  # Running as root
   echo "Installing Grimoire to ${INSTALL_DIR}..."
   cp "${BINARY_PATH}" "${INSTALL_DIR}/grimoire"
   chmod +x "${INSTALL_DIR}/grimoire"
 else
-  # Check if the user can write to the default location
+  # Not running as root, try to install or guide the user
   if [ -w "${INSTALL_DIR}" ]; then
     echo "Installing Grimoire to ${INSTALL_DIR}..."
     cp "${BINARY_PATH}" "${INSTALL_DIR}/grimoire"
     chmod +x "${INSTALL_DIR}/grimoire"
   else
-    # Try to use sudo
-    echo "Installing Grimoire to ${INSTALL_DIR} (requires sudo)..."
-    sudo cp "${BINARY_PATH}" "${INSTALL_DIR}/grimoire"
-    sudo chmod +x "${INSTALL_DIR}/grimoire"
+    if command -v sudo >/dev/null 2>&1; then
+      echo "Installing Grimoire to ${INSTALL_DIR} (requires sudo)..."
+      sudo cp "${BINARY_PATH}" "${INSTALL_DIR}/grimoire"
+      sudo chmod +x "${INSTALL_DIR}/grimoire"
+    else
+      # No sudo, offer to install to user's bin directory
+      USER_BIN="${HOME}/.local/bin"
+      echo "Cannot install to ${INSTALL_DIR} (permission denied and sudo not available)"
+      
+      if [ ! -d "${USER_BIN}" ]; then
+        echo "Creating directory ${USER_BIN}..."
+        mkdir -p "${USER_BIN}"
+      fi
+      
+      echo "Installing to ${USER_BIN} instead..."
+      cp "${BINARY_PATH}" "${USER_BIN}/grimoire"
+      chmod +x "${USER_BIN}/grimoire"
+      
+      if [[ ":${PATH}:" != *":${USER_BIN}:"* ]]; then
+        echo "Note: ${USER_BIN} is not in your PATH. You may need to add it:"
+        echo "  export PATH=\"\$PATH:${USER_BIN}\""
+        echo "Add this line to your shell's profile file (~/.bashrc, ~/.zshrc, etc.) to make it permanent."
+      fi
+    fi
   fi
 fi
 
-# Clean up
-echo "Cleaning up..."
-rm -rf "${TMP_DIR}"
-
 # Verify installation
 echo "Verifying installation..."
-if command -v grimoire >/dev/null 2>&1; then
-  echo "Grimoire ${VERSION} has been successfully installed!"
+GRIMOIRE_PATH=$(command -v grimoire 2>/dev/null || echo "")
+
+if [ -n "${GRIMOIRE_PATH}" ]; then
+  echo "Grimoire ${VERSION} has been successfully installed to ${GRIMOIRE_PATH}!"
   echo "Run 'grimoire --help' to get started"
 else
-  echo "Installation successful, but grimoire is not in your PATH."
-  echo "Make sure ${INSTALL_DIR} is in your PATH or manually move the binary to a directory in your PATH."
-fi
+  echo "Installation completed, but grimoire command is not in your PATH yet."
+  
+  # Check if we installed to a non-PATH location
+  if [ -x "${HOME}/.local/bin/grimoire" ]; then
+    echo "You can run it with: ${HOME}/.local/bin/grimoire"
+    echo "Or add ${HOME}/.local/bin to your PATH to use 'grimoire' directly."
+  elif [ -x "${INSTALL_DIR}/grimoire" ]; then
+    echo "You can run it with: ${INSTALL_DIR}/grimoire"
+    echo "Make sure ${INSTALL_DIR} is in your PATH to use 'grimoire' directly."
+  fi
+fi
+
+echo "Installation complete!"