Skip to content

Commit

Permalink
demos: fix terminal width for screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr committed Sep 17, 2023
1 parent e0baff6 commit 9f5343c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
5 changes: 4 additions & 1 deletion demos/helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -60,5 +62,6 @@ username = "jjfan"
[ui]
color="always"
paginate="never"
log-word-wrap=true # Need to set COLUMNS for this to work
EOF
}
9 changes: 9 additions & 0 deletions demos/run_scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,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}"
Expand Down

0 comments on commit 9f5343c

Please sign in to comment.