diff --git a/Makefile b/Makefile index 8bebf0d..455058f 100644 --- a/Makefile +++ b/Makefile @@ -20,17 +20,24 @@ uninstall: clobber: rm -f ../i2psetproxy.js.zip ../i2p_proxy*.xpi +VERSION=1.16 + xpi: mv ~/Downloads/i2p_proxy-$(VERSION)-an+fx.xpi ../i2psetproxy.js@eyedeekay.github.io.xpi cp: cp ../i2psetproxy.js@eyedeekay.github.io.xpi ./i2psetproxy.js@eyedeekay.github.io.xpi -VERSION=1.15 - version: sed -i 's|$(shell grep "\"version\": " manifest.json)| \"version\": \"$(VERSION)\",|g' manifest.json zip: version zip --exclude="./i2psetproxy.js@eyedeekay.github.io.xpi" \ --exclude="i2psetproxy.js.png" -r -FS ../i2psetproxy.js.zip * + +profile-install: + cp ./i2psetproxy.js@eyedeekay.github.io.xpi $(HOME)/.mozilla/firefox/firefox.profile.i2p/firefox.profile.i2p/extensions + cp ./i2psetproxy.js@eyedeekay.github.io.xpi $(HOME)/.mozilla/firefox/.firefox.profile.i2p.default/extensions + sudo cp ./i2psetproxy.js@eyedeekay.github.io.xpi /usr/local/lib/firefox.profile.i2p/firefox.profile.i2p/extensions/ + +pi: profile-install \ No newline at end of file diff --git a/i2psetproxy.js@eyedeekay.github.io.xpi b/i2psetproxy.js@eyedeekay.github.io.xpi index df9d996..85e9637 100644 Binary files a/i2psetproxy.js@eyedeekay.github.io.xpi and b/i2psetproxy.js@eyedeekay.github.io.xpi differ diff --git a/manifest.json b/manifest.json index bf3bb92..84c808b 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "permissions": ["theme", "proxy", "privacy", "storage"], "manifest_version": 2, "name": "__MSG_extensionName__", - "version": "1.15", + "version": "1.16", "description": "__MSG_extensionDescription__", "icons": { "48": "icons/toopie.png" diff --git a/options/options.js b/options/options.js index cb36e5f..7f41f0e 100644 --- a/options/options.js +++ b/options/options.js @@ -184,13 +184,13 @@ function SetPortText(){ } function SetControlHostText(){ - var hostid = document.getElementById('controlHostText'); - hostid.textContent = controlhosttext; + var controlhostid = document.getElementById('controlHostText'); + controlhostid.textContent = controlhosttext; } function SetControlPortText(){ - var portid = document.getElementById('controlPortText'); - portid.textContent = controlporttext; + var controlportid = document.getElementById('controlPortText'); + controlportid.textContent = controlporttext; } function SetControlHelpText(){ diff --git a/proxy.js b/proxy.js index 56c70d2..cfab8de 100644 --- a/proxy.js +++ b/proxy.js @@ -16,10 +16,12 @@ browser.privacy.network.webRTCIPHandlingPolicy.set({value: "disable_non_proxied_ console.log("Preliminarily disabled WebRTC.") -var controlHost = "127.0.0.1" -var controlPort = "7951" +var controlHost = "127.0.0.1" //getControlHost() +var controlPort = "7951" //getControlPort(); function setupProxy() { + var controlHost = getControlHost() + var controlPort = getControlPort(); if (isFirefox()) { if (getScheme() == "http") { var proxySettings = { @@ -66,10 +68,8 @@ function setupProxy() { function RefreshIdentity(){ console.log("Generating new identity") - const controlhost = controlHost; - const controlport = controlPort; const Http = new XMLHttpRequest(); - const url='http://' + controlhost + ":" + controlport + const url='http://' + controlHost + ":" + controlPort Http.open("GET", url); Http.send(); Http.onreadystatechange=(e)=>{