Merge remote-tracking branch 'origin/main' into atavism/auto-updates

getlantern · Jun 7, 2024 · 5dd27ab · 5dd27ab
2 parents e1645e1 + b091e06
commit 5dd27ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/desktop/app/app.go b/desktop/app/app.go
@@ -99,6 +99,7 @@ type App struct {
 func NewApp(flags flashlight.Flags, configDir string, proClient proclient.ProClient, settings *settings.Settings) *App {
 	analyticsSession := newAnalyticsSession(settings)
 	app := &App{
+		Flags:                     flags,
 		configDir:                 configDir,
 		exited:                    eventual.NewValue(),
 		proClient:                 proClient,

diff --git a/hit_proxy.bash b/hit_proxy.bash
@@ -16,4 +16,10 @@ mkdir -p "$TMPDIR"
 echo "Generating config for ${PROXY} in ${OUTFILE}..."
 $LANTERN_CLOUD/bin/ptool route dump-config --legacy "$PROXY" > "$OUTFILE"
 
-make darwin ffigen && LANTERN_CONFIGDIR=$TMPDIR LANTERN_PROXYALL=true flutter run -d macOS
+make darwin ffigen
+LANTERN_CONFIGDIR=$TMPDIR \
+LANTERN_STICKYCONFIG=true \
+LANTERN_READABLECONFIG=true \
+LANTERN_PROXYALL=true \
+LANTERN_STARTUP=false \
+flutter run -d macOS