Mirror/navicat-premium-reset-trial
1
0
Fork 0
mirror of https://github.com/tuxity/navicat-premium-reset-trial.git synced 2026-03-13 21:53:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: potential multiple keychain entries

Browse Source 
ref #3
This commit is contained in:
Kévin Darcel
2026-01-21 14:32:18 -06:00
parent 6c2b7202d6
commit bd21c8d0ab
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
reset-trial.sh
View File

@@ -59,7 +59,7 @@ hash2=${BASH_REMATCH[1]}
if [ ! -z "$hash2" ]; then if [ ! -z "$hash2" ]; then
echo "deleting $hash2 folder..." echo "deleting $hash2 folder..."
rm ~/Library/Application\ Support/PremiumSoft\ CyberTech/Navicat\ CC/Navicat\ Premium/.$hash2 rm -f ~/Library/Application\ Support/PremiumSoft\ CyberTech/Navicat\ CC/Navicat\ Premium/.$hash2
fi fi
# Keychain cleanup only needed for v17.3.7+ # Keychain cleanup only needed for v17.3.7+
@@ -72,11 +72,17 @@ if [[ "$version" == "17" ]]; then
fi fi
if [ "$needs_keychain" = true ]; then if [ "$needs_keychain" = true ]; then
keychain_hash=$(security dump-keychain ~/Library/Keychains/login.keychain-db 2>/dev/null | grep -A 5 $service | grep acct | grep -oE '[0-9A-F]{32}') # Get all keychain hashes for this service (may be multiple)
keychain_hashes=$(security dump-keychain ~/Library/Keychains/login.keychain-db 2>/dev/null | grep -A 5 "$service" | grep acct | grep -oE '[0-9A-F]{32}')
if [ ! -z "$keychain_hashes" ]; then
# Delete each keychain entry
while IFS= read -r keychain_hash; do
if [ ! -z "$keychain_hash" ]; then if [ ! -z "$keychain_hash" ]; then
echo "deleting keychain entry $keychain_hash..." echo "deleting keychain entry $keychain_hash..."
security delete-generic-password -s $service -a $keychain_hash &>/dev/null security delete-generic-password -s "$service" -a "$keychain_hash" &>/dev/null
fi
done <<< "$keychain_hashes"
fi fi
fi fi