wifi: fix SSID extraction to match correct field in security output

Author: axgd-code

src/import_installed.sh

@@ -60,17 +60,28 @@ fi
 check_homebrew_api() {
     local app=$1
     local type=$2
-    
+    # Use a short timeout and return 0 only on a successful HTTP 200 response
+    local url
     if [ "$type" = "cask" ]; then
-        curl -s -f -o /dev/null "https://formulae.brew.sh/api/cask/${app}.json"
+        url="https://formulae.brew.sh/api/cask/${app}.json"
     else
-        curl -s -f -o /dev/null "https://formulae.brew.sh/api/formula/${app}.json"
+        url="https://formulae.brew.sh/api/formula/${app}.json"
     fi
+    local http
+    http=$(curl -sS --max-time 6 -o /dev/null -w "%{http_code}" "$url" 2>/dev/null) || http=""
+    [ "$http" = "200" ]
 }
 
 check_chocolatey_api() {
     local app=$1
-    curl -s -f "https://community.chocolatey.org/api/v2/Packages()?%24filter=tolower(Id)%20eq%20tolower('${app}')" | grep -q "${app}"
+    local url="https://community.chocolatey.org/api/v2/Packages()?%24filter=tolower(Id)%20eq%20tolower('${app}')&%24select=Id"
+    local out
+    out=$(curl -sS --max-time 8 "$url" 2>/dev/null) || out=""
+    if [ -z "$out" ]; then
+        return 1
+    fi
+    # case-insensitive match of app id in returned XML/JSON
+    echo "$out" | tr '[:upper:]' '[:lower:]' | grep -q "$(echo "$app" | tr '[:upper:]' '[:lower:]')"
 }
 
 # Detect operating system

src/packages.conf

@@ -77,3 +77,38 @@ cask|font-inconsolata-nerd-font|-|Inconsolata Nerd Font
 cask|font-open-sans|-|Open Sans font
 cask|font-poppins|-|Poppins font
 cask|font-roboto|-|Roboto font
+brew|automake|automake|Imported from macOS
+brew|cmake|cmake|Imported from macOS
+brew|gemini-cli|gemini-cli|Imported from macOS
+brew|hugo|hugo|Imported from macOS
+brew|libtool|libtool|Imported from macOS
+brew|maven|maven|Imported from macOS
+brew|openjdk@17|-|Imported from macOS
+brew|p7zip|p7zip|Imported from macOS
+brew|parallel|parallel|Imported from macOS
+brew|pipx|pipx|Imported from macOS
+brew|postgresql@18|-|Imported from macOS
+brew|protobuf-c|protobuf-c|Imported from macOS
+brew|python@3.12|-|Imported from macOS
+brew|sevenzip|sevenzip|Imported from macOS
+brew|shc|shc|Imported from macOS
+brew|sst/tap/opencode|-|Imported from macOS
+brew|testdisk|testdisk|Imported from macOS
+brew|virtualenv|virtualenv|Imported from macOS
+brew|woob|woob|Imported from macOS
+cask|android-studio|android-studio|Imported from macOS
+cask|anytype|anytype|Imported from macOS
+cask|autodesk-fusion|autodesk-fusion|Imported from macOS
+cask|balenaetcher|balenaetcher|Imported from macOS
+cask|claude|claude|Imported from macOS
+cask|ddpm|ddpm|Imported from macOS
+cask|hyprnote|hyprnote|Imported from macOS
+cask|keeweb|keeweb|Imported from macOS
+cask|logi-options+|-|Imported from macOS
+cask|notion|notion|Imported from macOS
+cask|onyx|onyx|Imported from macOS
+cask|postman|postman|Imported from macOS
+cask|spectacle|spectacle|Imported from macOS
+cask|spotify|spotify|Imported from macOS
+cask|thunderbird|thunderbird|Imported from macOS
+cask|yubico-yubikey-manager|yubico-yubikey-manager|Imported from macOS

src/wifi_from_keychain.sh

@@ -68,7 +68,7 @@ require_cmd() {
 list_ssids_from_keychain() {
     # Use `security` to list generic passwords of kind "AirPort network password" and extract acct (SSID)
     security find-generic-password -D "AirPort network password" 2>/dev/null \
-        | awk -F'"' '/acct/{print $2}' \
+        | awk -F'"' '/"acct"<blob>="/{print $4}' \
         | sort -u
 }
 

ui/app.py

@@ -304,13 +304,37 @@ def api_action_install():
 @app.route('/api/action/import-installed', methods=['POST'])
 def api_action_import_installed():
     # Run bash src/import_installed.sh
-    script = BASE_DIR / 'src' / 'import_installed.sh'
-    if not script.exists():
-        return jsonify({'error':'import_installed.sh script not found'}), 500
+    def find_script(name):
+        candidates = []
+        # repo-relative (dev mode)
+        candidates.append(BASE_DIR / 'src' / name)
+        # current working dir
+        candidates.append(Path.cwd() / 'src' / name)
+        # next to the executable (one-dir builds)
+        candidates.append(Path(sys.executable).parent / 'src' / name)
+        # PyInstaller onefile unpack dir
+        meipass = getattr(sys, '_MEIPASS', None)
+        if meipass:
+            candidates.append(Path(meipass) / 'src' / name)
+
+        found = None
+        checked = []
+        for c in candidates:
+            checked.append(str(c))
+            if c.exists():
+                found = c
+                break
+        return found, checked
+
+    script_name = 'import_installed.sh'
+    script, checked = find_script(script_name)
+    if not script:
+        return jsonify({'error': f"{script_name} script not found", 'checked': checked}), 500
+
     try:
         cmd = ['bash', str(script)]
         res = subprocess.run(cmd, capture_output=True, text=True)
-        return jsonify({'stdout': res.stdout, 'stderr': res.stderr, 'code': res.returncode})
+        return jsonify({'stdout': res.stdout, 'stderr': res.stderr, 'code': res.returncode, 'used': str(script)})
     except Exception as e:
         return jsonify({'error': str(e)}), 500