From 1ce03e414ef32aa52117e17bcc14d3cc2614f6e6 Mon Sep 17 00:00:00 2001 From: Carlos Polop Date: Mon, 21 Apr 2025 00:12:01 +0200 Subject: [PATCH] remove searchindex.json as it's not use anymore --- .github/workflows/build_master.yml | 5 +---- .github/workflows/translate_af.yml | 5 +---- .github/workflows/translate_de.yml | 5 +---- .github/workflows/translate_el.yml | 5 +---- .github/workflows/translate_es.yml | 5 +---- .github/workflows/translate_fr.yml | 5 +---- .github/workflows/translate_hi.yml | 5 +---- .github/workflows/translate_it.yml | 5 +---- .github/workflows/translate_ja.yml | 5 +---- .github/workflows/translate_ko.yml | 5 +---- .github/workflows/translate_pl.yml | 5 +---- .github/workflows/translate_pt.yml | 5 +---- .github/workflows/translate_sr.yml | 5 +---- .github/workflows/translate_sw.yml | 5 +---- .github/workflows/translate_tr.yml | 5 +---- .github/workflows/translate_uk.yml | 5 +---- .github/workflows/translate_zh.yml | 5 +---- theme/ht_searcher.js | 24 ++---------------------- 18 files changed, 19 insertions(+), 90 deletions(-) diff --git a/.github/workflows/build_master.yml b/.github/workflows/build_master.yml index af83ac642..86e9f25d6 100644 --- a/.github/workflows/build_master.yml +++ b/.github/workflows/build_master.yml @@ -47,10 +47,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_af.yml b/.github/workflows/translate_af.yml index dba3884a7..ba80b1159 100644 --- a/.github/workflows/translate_af.yml +++ b/.github/workflows/translate_af.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_de.yml b/.github/workflows/translate_de.yml index 3a37c981f..f58f13087 100644 --- a/.github/workflows/translate_de.yml +++ b/.github/workflows/translate_de.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_el.yml b/.github/workflows/translate_el.yml index 9cc6c5110..747aa5358 100644 --- a/.github/workflows/translate_el.yml +++ b/.github/workflows/translate_el.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_es.yml b/.github/workflows/translate_es.yml index e3273bdb8..83240c5f2 100644 --- a/.github/workflows/translate_es.yml +++ b/.github/workflows/translate_es.yml @@ -74,10 +74,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_fr.yml b/.github/workflows/translate_fr.yml index c3154095d..efce336b1 100644 --- a/.github/workflows/translate_fr.yml +++ b/.github/workflows/translate_fr.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_hi.yml b/.github/workflows/translate_hi.yml index 63d2feee9..e15c40ce4 100644 --- a/.github/workflows/translate_hi.yml +++ b/.github/workflows/translate_hi.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_it.yml b/.github/workflows/translate_it.yml index 1c23fe47e..b14a24402 100644 --- a/.github/workflows/translate_it.yml +++ b/.github/workflows/translate_it.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_ja.yml b/.github/workflows/translate_ja.yml index 62807768d..841be162b 100644 --- a/.github/workflows/translate_ja.yml +++ b/.github/workflows/translate_ja.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_ko.yml b/.github/workflows/translate_ko.yml index 4a5b9844e..64e82a7c5 100644 --- a/.github/workflows/translate_ko.yml +++ b/.github/workflows/translate_ko.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_pl.yml b/.github/workflows/translate_pl.yml index ee169a5d1..d2cac3cc9 100644 --- a/.github/workflows/translate_pl.yml +++ b/.github/workflows/translate_pl.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_pt.yml b/.github/workflows/translate_pt.yml index c1e37c001..a72d68548 100644 --- a/.github/workflows/translate_pt.yml +++ b/.github/workflows/translate_pt.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_sr.yml b/.github/workflows/translate_sr.yml index aaea63a50..b7ea90c77 100644 --- a/.github/workflows/translate_sr.yml +++ b/.github/workflows/translate_sr.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_sw.yml b/.github/workflows/translate_sw.yml index 19d7e95de..be1968950 100644 --- a/.github/workflows/translate_sw.yml +++ b/.github/workflows/translate_sw.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_tr.yml b/.github/workflows/translate_tr.yml index 393fb8906..d1ce03022 100644 --- a/.github/workflows/translate_tr.yml +++ b/.github/workflows/translate_tr.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_uk.yml b/.github/workflows/translate_uk.yml index 0e7f05697..dbfe61a10 100644 --- a/.github/workflows/translate_uk.yml +++ b/.github/workflows/translate_uk.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/.github/workflows/translate_zh.yml b/.github/workflows/translate_zh.yml index b5f3215b4..e50fbf04e 100644 --- a/.github/workflows/translate_zh.yml +++ b/.github/workflows/translate_zh.yml @@ -75,10 +75,7 @@ jobs: if [ -f "book/searchindex.js" ]; then cp book/searchindex.js searchindex.js fi - if [ -f "book/searchindex.json" ]; then - cp book/searchindex.json searchindex.json - fi - (git add searchindex.js searchindex.json; + (git add searchindex.js; git commit -m "Update searchindex"; git push) || echo "No changes to searchindex.js" diff --git a/theme/ht_searcher.js b/theme/ht_searcher.js index e77213e96..d9ef0606b 100644 --- a/theme/ht_searcher.js +++ b/theme/ht_searcher.js @@ -475,9 +475,7 @@ window.search = window.search || {}; /* ───────── paths ───────── */ const branch = lang === 'en' ? 'master' : lang; const baseRemote = `https://raw.githubusercontent.com/HackTricks-wiki/hacktricks/${branch}`; - const remoteJson = `${baseRemote}/searchindex.json`; const remoteJs = `${baseRemote}/searchindex.js`; - const localJson = './searchindex.json'; const localJs = './searchindex.js'; const TIMEOUT_MS = 5_000; @@ -497,16 +495,7 @@ window.search = window.search || {}; document.head.appendChild(s); }); - /* ───────── 1. remote JSON ───────── */ - try { - const r = await fetchWithTimeout(remoteJson); - if (!r.ok) throw new Error(r.status); - return init(await r.json()); - } catch (e) { - console.warn('Remote JSON failed →', e); - } - - /* ───────── 2. remote JS ───────── */ + /* ───────── 1. remote JS ───────── */ try { await loadScript(remoteJs); return init(window.search); @@ -514,16 +503,7 @@ window.search = window.search || {}; console.warn('Remote JS failed →', e); } - /* ───────── 3. local JSON ───────── */ - try { - const r = await fetch(localJson); - if (!r.ok) throw new Error(r.status); - return init(await r.json()); - } catch (e) { - console.warn('Local JSON failed →', e); - } - - /* ───────── 4. local JS ───────── */ + /* ───────── 2. local JS ───────── */ try { await loadScript(localJs); return init(window.search);