diff --git a/demos/helpers.sh b/demos/helpers.sh index f6a83a7567..cdc2ceeb5e 100644 --- a/demos/helpers.sh +++ b/demos/helpers.sh @@ -11,7 +11,9 @@ new_tmp_dir() { run_command() { echo "\$ $@" - eval "$@" + # `bash` often resets $COLUMNS, so we also + # allow $RUN_COMMAND_COLUMNS + COLUMNS=${RUN_COMMAND_COLUMNS-${COLUMNS-80}} eval "$@" } run_command_allow_broken_pipe() { diff --git a/demos/run_scripts.sh b/demos/run_scripts.sh index 9b264411cf..e41c218526 100755 --- a/demos/run_scripts.sh +++ b/demos/run_scripts.sh @@ -31,6 +31,15 @@ GIT_CONFIG_GLOBAL=$(mktemp --tmpdir gitconfig-XXXX) export GIT_CONFIG_GLOBAL git_config "$GIT_CONFIG_GLOBAL" +# Make `jj` wrap text as opposed to `term-transcript` Currently, 80 is the only +# value that tool supports when used as a CLI. +# https://github.com/slowli/term-transcript/issues/59 +# +# Note that `bash` likes to reset the value of $COLUMNS, so we need to use a +# different variable here. +RUN_COMMAND_COLUMNS=80 +export RUN_COMMAND_COLUMNS + run_script_through_term_transcript_and_pipe_result_to_stderr() { script="$1" script_base="${script%.sh}"