mirrors/Mole
1
0
Fork 0
mirror of https://github.com/tw93/Mole.git synced 2026-02-04 15:39:42 +00:00
Code Activity

1.15.7 Repair and update check

Browse Source
This commit is contained in:
Tw93
2025-12-29 15:46:59 +08:00
parent b787c78b37
commit c1e7290f4d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
install.sh
View File

@@ -179,7 +179,7 @@ get_installed_version() {
if [[ -x "$binary" ]]; then if [[ -x "$binary" ]]; then
# Try running the binary first (preferred method) # Try running the binary first (preferred method)
local version local version
version=$("$binary" --version 2> /dev/null | awk 'NF {print $NF; exit}') version=$("$binary" --version 2> /dev/null | awk '/Mole version/ {print $NF; exit}')
if [[ -n "$version" ]]; then if [[ -n "$version" ]]; then
echo "$version" echo "$version"
else else
@@ -525,10 +525,12 @@ perform_update() {
if command -v brew > /dev/null 2>&1 && brew list mole > /dev/null 2>&1; then if command -v brew > /dev/null 2>&1 && brew list mole > /dev/null 2>&1; then
# Try to use shared function if available (when running from installed Mole) # Try to use shared function if available (when running from installed Mole)
resolve_source_dir 2> /dev/null || true resolve_source_dir 2> /dev/null || true
local current_version
current_version=$(get_installed_version || echo "unknown")
if [[ -f "$SOURCE_DIR/lib/core/common.sh" ]]; then if [[ -f "$SOURCE_DIR/lib/core/common.sh" ]]; then
# shellcheck disable=SC1090,SC1091 # shellcheck disable=SC1090,SC1091
source "$SOURCE_DIR/lib/core/common.sh" source "$SOURCE_DIR/lib/core/common.sh"
update_via_homebrew "$VERSION" update_via_homebrew "$current_version"
else else
# Fallback: inline implementation # Fallback: inline implementation
if [[ -t 1 ]]; then if [[ -t 1 ]]; then
@@ -553,9 +555,9 @@ perform_update() {
fi fi
if echo "$upgrade_output" | grep -q "already installed"; then if echo "$upgrade_output" | grep -q "already installed"; then
local current_version local brew_version
current_version=$(brew list --versions mole 2> /dev/null | awk '{print $2}') brew_version=$(brew list --versions mole 2> /dev/null | awk '{print $2}')
echo -e "${GREEN}✓${NC} Already on latest version (${current_version:-$VERSION})" echo -e "${GREEN}✓${NC} Already on latest version (${brew_version:-$current_version})"
elif echo "$upgrade_output" | grep -q "Error:"; then elif echo "$upgrade_output" | grep -q "Error:"; then
log_error "Homebrew upgrade failed" log_error "Homebrew upgrade failed"
echo "$upgrade_output" | grep "Error:" >&2 echo "$upgrade_output" | grep "Error:" >&2
@@ -564,7 +566,7 @@ perform_update() {
echo "$upgrade_output" | grep -Ev "^(==>|Updating Homebrew|Warning:)" || true echo "$upgrade_output" | grep -Ev "^(==>|Updating Homebrew|Warning:)" || true
local new_version local new_version
new_version=$(brew list --versions mole 2> /dev/null | awk '{print $2}') new_version=$(brew list --versions mole 2> /dev/null | awk '{print $2}')
echo -e "${GREEN}✓${NC} Updated to latest version (${new_version:-$VERSION})" echo -e "${GREEN}✓${NC} Updated to latest version (${new_version:-$current_version})"
fi fi
rm -f "$HOME/.cache/mole/version_check" "$HOME/.cache/mole/update_message" rm -f "$HOME/.cache/mole/version_check" "$HOME/.cache/mole/update_message"

2
mole
View File

@@ -25,7 +25,7 @@ source "$SCRIPT_DIR/lib/core/common.sh"
trap cleanup_temp_files EXIT INT TERM trap cleanup_temp_files EXIT INT TERM
# Version info # Version info
VERSION="1.15.6" VERSION="1.15.7"
MOLE_TAGLINE="Deep clean and optimize your Mac." MOLE_TAGLINE="Deep clean and optimize your Mac."
# Check TouchID configuration # Check TouchID configuration