Skip to content

Commit 947d4a6

Browse files
committed
flatpak: Enable progress escape sequence by default
In 4febfb5 ("flatpak: Disable progress escape sequence by default") the escape sequence has been disabled by default, but we want to enable it again for 1.18.
1 parent ff80ba5 commit 947d4a6

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

app/flatpak-tty-utils.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,10 @@ use_progress_escape_sequence (void)
533533

534534
if (g_once_init_enter (&tty_progress_once))
535535
{
536-
// FIXME: make this opt-out for Flatpak 1.18
537-
if (g_strcmp0 (g_getenv ("FLATPAK_TTY_PROGRESS"), "1") == 0)
538-
g_once_init_leave (&tty_progress_once, TTY_PROGRESS_ENABLED);
539-
else
536+
if (g_strcmp0 (g_getenv ("FLATPAK_TTY_PROGRESS"), "0") == 0)
540537
g_once_init_leave (&tty_progress_once, TTY_PROGRESS_DISABLED);
538+
else
539+
g_once_init_leave (&tty_progress_once, TTY_PROGRESS_ENABLED);
541540
}
542541

543542
return tty_progress_once == TTY_PROGRESS_ENABLED;

doc/flatpak.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -803,11 +803,10 @@
803803
<term><envar>FLATPAK_TTY_PROGRESS</envar></term>
804804

805805
<listitem><para>
806-
May be set to <literal>1</literal> to enable reporting
806+
May be set to <literal>0</literal> to disable reporting
807807
machine-readable progress to the terminal.
808-
This feature is not currently enabled by default
809-
because it uses the OSC 9;4 sequence,
810-
which some terminal emulators interpret as a
808+
This feature can be disabled because it uses the OSC 9;4
809+
sequence, which some terminal emulators interpret as a
811810
popup notification.
812811
</para></listitem>
813812
</varlistentry>

0 commit comments

Comments
 (0)