From 438a4564b0308afb0cf09328248d7d99d4a7329b Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Mon, 28 Aug 2023 15:42:44 -0700
Subject: [PATCH] demos: rename `demo_helpers.sh` and
 `demo_resolve_conflict.sh`

I think it's clearer if only the actual demos started with `demo_`,
so I renamed `demo_helpers.sh` to just `helpers.sh`.

`demo_resolve_conflict.sh` should match `resolve_conflicts.png` (with an s).
---
 demos/demo_git_compat.sh                                      | 2 +-
 demos/demo_juggle_conflicts.sh                                | 2 +-
 demos/demo_operation_log.sh                                   | 2 +-
 demos/{demo_resolve_conflict.sh => demo_resolve_conflicts.sh} | 2 +-
 demos/demo_working_copy.sh                                    | 2 +-
 demos/{demo_helpers.sh => helpers.sh}                         | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename demos/{demo_resolve_conflict.sh => demo_resolve_conflicts.sh} (96%)
 rename demos/{demo_helpers.sh => helpers.sh} (100%)

diff --git a/demos/demo_git_compat.sh b/demos/demo_git_compat.sh
index a2a1b41fb..6b841c88b 100755
--- a/demos/demo_git_compat.sh
+++ b/demos/demo_git_compat.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -euo pipefail
-. "$(dirname "$0")"/demo_helpers.sh
+. "$(dirname "$0")"/helpers.sh
 
 new_tmp_dir
 
diff --git a/demos/demo_juggle_conflicts.sh b/demos/demo_juggle_conflicts.sh
index 8a7b4ef97..c487ca49b 100755
--- a/demos/demo_juggle_conflicts.sh
+++ b/demos/demo_juggle_conflicts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -euo pipefail
-. "$(dirname "$0")"/demo_helpers.sh
+. "$(dirname "$0")"/helpers.sh
 
 new_tmp_dir
 jj init --config-toml ui.allow-init-native=true
diff --git a/demos/demo_operation_log.sh b/demos/demo_operation_log.sh
index 2b3e53094..1e603f9ac 100755
--- a/demos/demo_operation_log.sh
+++ b/demos/demo_operation_log.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -euo pipefail
-. "$(dirname "$0")"/demo_helpers.sh
+. "$(dirname "$0")"/helpers.sh
 
 new_tmp_dir
 jj git clone https://github.com/octocat/Hello-World
diff --git a/demos/demo_resolve_conflict.sh b/demos/demo_resolve_conflicts.sh
similarity index 96%
rename from demos/demo_resolve_conflict.sh
rename to demos/demo_resolve_conflicts.sh
index ddf0eaee4..4cf422eca 100755
--- a/demos/demo_resolve_conflict.sh
+++ b/demos/demo_resolve_conflicts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -euo pipefail
-. "$(dirname "$0")"/demo_helpers.sh
+. "$(dirname "$0")"/helpers.sh
 
 new_tmp_dir
 jj git clone https://github.com/octocat/Hello-World
diff --git a/demos/demo_working_copy.sh b/demos/demo_working_copy.sh
index 7de0bfaff..bd3c802d5 100755
--- a/demos/demo_working_copy.sh
+++ b/demos/demo_working_copy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -euo pipefail
-. "$(dirname "$0")"/demo_helpers.sh
+. "$(dirname "$0")"/helpers.sh
 
 new_tmp_dir
 jj git clone https://github.com/octocat/Hello-World
diff --git a/demos/demo_helpers.sh b/demos/helpers.sh
similarity index 100%
rename from demos/demo_helpers.sh
rename to demos/helpers.sh