More tweaks for proxy config

snow8261 · Sep 2, 2011 · 432521c · 432521c
1 parent 34b5df0
commit 432521c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/install/lantern.install4j b/install/lantern.install4j
@@ -628,7 +628,7 @@ Lantern requires your Google Account credentials to access the Internet. What yo
                         </object>
                       </void>
                       <void property="executionType">
-                        <object class="com.install4j.runtime.beans.actions.misc.ExecutionType" field="ORIGINAL_USER" />
+                        <object class="com.install4j.runtime.beans.actions.misc.ExecutionType" field="ADMIN" />
                       </void>
                       <void property="logArguments">
                         <boolean>true</boolean>

diff --git a/install/osx/configureOsx.bash b/install/osx/configureOsx.bash
@@ -67,10 +67,10 @@ log "Copied pac file!!"
 log "Configuring network services"
 while read s; 
 do
-    echo "Configuring network: $s"
+    log "Configuring network: $s"
     sudo networksetup -setautoproxyurl "$s" file://localhost$HOME/.lantern/proxy.pac || log "Could not set auto proxy URL for $s"
     sudo networksetup -setautoproxystate "$s" "on" || log "Could not turn auto proxy on for $s"
-    echo "Configured network: $s"
+    log "Configured network: $s"
 done < <(networksetup -listallnetworkservices | tail +2)
 log "Done configuring network services!!"
 

diff --git a/proxy_off.pac b/proxy_off.pac
@@ -0,0 +1,3 @@
+function FindProxyForURL(url, host) {
+    return "DIRECT";
+}
diff --git a/proxy_on.pac b/proxy_on.pac
@@ -0,0 +1,3 @@
+function FindProxyForURL(url, host) {
+    return "PROXY 127.0.0.1:8787";
+}