update install.sh and unistall.sh

Author: qelphybox

scripts/install.sh

@@ -8,120 +8,122 @@ RED='\033[0;31m'
 YELLOW='\033[1;33m'
 NC='\033[0m' # No Color
 
-# Detect platform
+# Function to print colored output
+print_info() {
+    echo "${GREEN}$1${NC}"
+}
+
+print_error() {
+    echo "${RED}$1${NC}"
+}
+
+print_warning() {
+    echo "${YELLOW}$1${NC}"
+}
+
+# Detect platform and architecture
 OS=$(uname -s | tr '[:upper:]' '[:lower:]')
 ARCH=$(uname -m)
 
 case "$ARCH" in
     x86_64|amd64) ARCH="amd64" ;;
     aarch64|arm64) ARCH="arm64" ;;
-    *) echo "Unsupported architecture: $ARCH"; exit 1 ;;
+    *) 
+        print_error "Unsupported architecture: $ARCH"
+        exit 1 
+        ;;
 esac
 
 case "$OS" in
     linux) BIN_NAME="sitedog-linux-$ARCH" ;;
     darwin) BIN_NAME="sitedog-darwin-$ARCH" ;;
-    *) echo "Unsupported OS: $OS"; exit 1 ;;
+    *) 
+        print_error "Unsupported OS: $OS"
+        exit 1 
+        ;;
 esac
 
-# Directories
-INSTALL_DIR="$HOME/.sitedog/bin"
-TEMPLATES_DIR="$HOME/.sitedog"
+# Setup directories
+INSTALL_DIR="$HOME/.sitedog"
+BINARY_DIR="$HOME/.sitedog/bin"
+
+print_info "Creating user directory $INSTALL_DIR"
 mkdir -p "$INSTALL_DIR"
-mkdir -p "$TEMPLATES_DIR"
+mkdir -p "$BINARY_DIR"
 
-# Download latest release from GitHub (без jq)
+# GitHub repository and API
 REPO="SiteDog-io/sitedog-cli"
 API_URL="https://api.github.com/repos/$REPO/releases/latest"
 
-# Получаем ссылку на нужный бинарник из релиза (без jq)
-ASSET_URL=$(curl -s "$API_URL" | grep 'browser_download_url' | grep "$BIN_NAME" | head -n1 | cut -d '"' -f 4)
+# Get latest release assets
+RELEASE_INFO=$(curl -s "$API_URL")
+if [ $? -ne 0 ]; then
+    print_error "Failed to fetch release information from GitHub"
+    exit 1
+fi
+
+# Extract version and binary download URL
+VERSION=$(echo "$RELEASE_INFO" | grep '"tag_name"' | head -n1 | cut -d '"' -f 4)
+ASSET_URL=$(echo "$RELEASE_INFO" | grep 'browser_download_url' | grep "$BIN_NAME" | head -n1 | cut -d '"' -f 4)
 
 if [ -z "$ASSET_URL" ]; then
-    echo "${RED}Error: Could not find asset $BIN_NAME in the latest release${NC}"
+    print_error "Could not find binary $BIN_NAME in the latest release"
     exit 1
 fi
 
-echo "Downloading $BIN_NAME from $ASSET_URL..."
-curl -sL "$ASSET_URL" -o "$INSTALL_DIR/sitedog"
+print_info "Installing version $VERSION"
 
-# Check if file was downloaded
-if [ ! -f "$INSTALL_DIR/sitedog" ]; then
-    echo "${RED}Error: Failed to download sitedog${NC}"
+# Download binary
+curl -sL "$ASSET_URL" -o "$BINARY_DIR/sitedog"
+
+if [ ! -f "$BINARY_DIR/sitedog" ]; then
+    print_error "Failed to download binary"
     exit 1
 fi
 
-# Make file executable
-chmod +x "$INSTALL_DIR/sitedog"
-echo "Installed sitedog to $INSTALL_DIR/sitedog"
+chmod +x "$BINARY_DIR/sitedog"
 
-# Download demo.html.tpl template
+# Download template
 TPL_NAME="demo.html.tpl"
-TPL_URL=$(curl -s "$API_URL" | grep 'browser_download_url' | grep "$TPL_NAME" | head -n1 | cut -d '"' -f 4)
+TPL_URL=$(echo "$RELEASE_INFO" | grep 'browser_download_url' | grep "$TPL_NAME" | head -n1 | cut -d '"' -f 4)
 
 if [ -z "$TPL_URL" ]; then
-    echo "${RED}Error: Could not find asset $TPL_NAME in the latest release${NC}"
+    print_error "Could not find template $TPL_NAME in the latest release"
     exit 1
 fi
 
-echo "Downloading $TPL_NAME from $TPL_URL..."
-curl -sL "$TPL_URL" -o "$TEMPLATES_DIR/demo.html.tpl"
+curl -sL "$TPL_URL" -o "$INSTALL_DIR/demo.html.tpl"
 
-# Check if template was downloaded
-if [ ! -f "$TEMPLATES_DIR/demo.html.tpl" ]; then
-    echo "${RED}Error: Failed to download demo.html.tpl${NC}"
+if [ ! -f "$INSTALL_DIR/demo.html.tpl" ]; then
+    print_error "Failed to download template"
     exit 1
 fi
 
-echo "Installed demo.html.tpl to $TEMPLATES_DIR/demo.html.tpl"
-
-# Add to PATH if not already there
-RELOAD_MSG=""
+# Determine shell profile and update PATH
 PROFILE=""
-# Determine shell profile to update
 case "$(basename "$SHELL")" in
     zsh) PROFILE="$HOME/.zshrc" ;;
     fish) PROFILE="$HOME/.config/fish/config.fish" ;;
     *) PROFILE="$HOME/.bashrc" ;;
 esac
 
-if ! echo "$PATH" | grep -q "$INSTALL_DIR"; then
-    # Add to PATH in the appropriate profile
+# Check if PATH already contains the binary directory
+if ! grep -Eq 'PATH.*sitedog' "$PROFILE"; then
     if [ "$SHELL" = "/usr/bin/fish" ] || [ "$SHELL" = "/bin/fish" ]; then
-        echo "set -gx PATH \"$INSTALL_DIR\" \$PATH" >> "$PROFILE"
+        # For fish shell, add the appropriate PATH export
+        echo "set -gx PATH \"$BINARY_DIR\" \$PATH" >> "$PROFILE"
     else
-        echo "export PATH=\"$INSTALL_DIR:\$PATH\"" >> "$PROFILE"
+        # For bash/zsh, add the appropriate PATH export
+        echo "export PATH=\"$BINARY_DIR:\$PATH\"" >> "$PROFILE"
     fi
-    
-    RELOAD_MSG="${YELLOW} (source $PROFILE or restart your shell)${NC}"
 fi
 
-echo "${GREEN}SiteDog has been installed successfully!${NC}"
-echo "Installed to: ${INSTALL_DIR}/sitedog${RELOAD_MSG}"
-
-# Ask user if they want to create symlink in /usr/local/bin
+# Success message
 echo ""
-printf "Create symlink in /usr/local/bin? (sudo) [y/N] "
-read -r REPLY
-
-if [ "$REPLY" = "y" ] || [ "$REPLY" = "Y" ] || [ "$REPLY" = "yes" ] || [ "$REPLY" = "YES" ]; then
-    if sudo ln -sf "$INSTALL_DIR/sitedog" /usr/local/bin/sitedog; then
-        echo "${GREEN}🔗 Symlink created → /usr/local/bin/sitedog${NC}"
-    else
-        echo "${RED}Failed to create symlink${NC}"
-    fi
-else
-    echo "Global symlink skipped."
-fi
-
+print_info "SiteDog successfully installed!"
 echo ""
 echo "Try: sitedog help"
-
-# Show reload message if PATH was updated
-if [ -n "$PROFILE" ]; then
-    echo ""
-    echo "${YELLOW}If 'sitedog help' doesn't work, run:${NC}"
-    echo ""
-    echo "source $PROFILE"
-    echo ""
-fi 
+echo ""
+print_warning "If 'sitedog help' doesn't work, run:"
+echo "source $PROFILE"
+echo ""

scripts/uninstall.sh

@@ -20,4 +20,20 @@ if [ -d "$HOME/.sitedog" ]; then
     echo "${GREEN}Removed $HOME/.sitedog directory${NC}"
 fi
 
+# Remove PATH entries from shell profiles
+for RC in "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/fish/config.fish"; do
+    if [ -f "$RC" ]; then
+        # Remove lines that add sitedog to PATH
+        case "$(uname)" in
+            Darwin*)
+                sed -i '' '/sitedog\/bin.*PATH/d' "$RC"
+                ;;
+            *)
+                sed -i '/sitedog\/bin.*PATH/d' "$RC"
+                ;;
+        esac
+        echo "${GREEN}Cleaned PATH from $RC${NC}"
+    fi
+done
+
 echo "${GREEN}SiteDog has been fully uninstalled!${NC}"