From 68b8069c5e6f0a226d30530976a33effecfff743 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 28 Aug 2023 22:59:58 -0700 Subject: [PATCH] demos: redirect setup commands to `/dev/null` Previously, we needed to remove this manually from screenshots. --- demos/demo_juggle_conflicts.sh | 22 ++++++++++++---------- demos/demo_operation_log.sh | 2 +- demos/demo_resolve_conflicts.sh | 2 +- demos/demo_working_copy.sh | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/demos/demo_juggle_conflicts.sh b/demos/demo_juggle_conflicts.sh index c487ca49b..9ce0179b7 100755 --- a/demos/demo_juggle_conflicts.sh +++ b/demos/demo_juggle_conflicts.sh @@ -3,16 +3,18 @@ set -euo pipefail . "$(dirname "$0")"/helpers.sh new_tmp_dir -jj init --config-toml ui.allow-init-native=true -echo "first" > file -jj branch create first -jj commit -m 'first' -echo "second" > file -jj branch create second -jj commit -m 'second' -echo "third" > file -jj branch create third -jj commit -m 'third' +( + jj init --config-toml ui.allow-init-native=true + echo "first" > file + jj branch create first + jj commit -m 'first' + echo "second" > file + jj branch create second + jj commit -m 'second' + echo "third" > file + jj branch create third + jj commit -m 'third' +) >/dev/null comment "We are in a repo with three commits, all editing the same line:" diff --git a/demos/demo_operation_log.sh b/demos/demo_operation_log.sh index 1e603f9ac..6b23a88f5 100755 --- a/demos/demo_operation_log.sh +++ b/demos/demo_operation_log.sh @@ -3,7 +3,7 @@ set -euo pipefail . "$(dirname "$0")"/helpers.sh new_tmp_dir -jj git clone https://github.com/octocat/Hello-World +jj git clone https://github.com/octocat/Hello-World > /dev/null cd Hello-World comment "We are in the octocat/Hello-World repo. diff --git a/demos/demo_resolve_conflicts.sh b/demos/demo_resolve_conflicts.sh index 4cf422eca..a83dc646e 100755 --- a/demos/demo_resolve_conflicts.sh +++ b/demos/demo_resolve_conflicts.sh @@ -3,7 +3,7 @@ set -euo pipefail . "$(dirname "$0")"/helpers.sh new_tmp_dir -jj git clone https://github.com/octocat/Hello-World +jj git clone https://github.com/octocat/Hello-World > /dev/null cd Hello-World comment "We are on the master branch of the diff --git a/demos/demo_working_copy.sh b/demos/demo_working_copy.sh index bd3c802d5..e8085c6c7 100755 --- a/demos/demo_working_copy.sh +++ b/demos/demo_working_copy.sh @@ -3,7 +3,7 @@ set -euo pipefail . "$(dirname "$0")"/helpers.sh new_tmp_dir -jj git clone https://github.com/octocat/Hello-World +jj git clone https://github.com/octocat/Hello-World > /dev/null cd Hello-World comment "We are in the octocat/Hello-World repo.