fix: direct users to exit Claude Code for migration instead of using ! prefix
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
committed by
Koshkoshinsk
parent
6daa1a3ffe
commit
5deccc44ea
@@ -6,8 +6,8 @@ This is NanoClaw v2, a ground-up rewrite with breaking changes throughout. It ca
|
|||||||
|
|
||||||
**Do this instead:**
|
**Do this instead:**
|
||||||
1. Abort the merge: `git merge --abort` (or `git reset --hard ORIG_HEAD` if the merge already completed).
|
1. Abort the merge: `git merge --abort` (or `git reset --hard ORIG_HEAD` if the merge already completed).
|
||||||
2. Tell the user, verbatim: *"This is the v2 rewrite — it can't be merged into your existing install. Run `! bash migrate-v2.sh` to migrate instead."*
|
2. Tell the user, verbatim: *"This is the v2 rewrite — it can't be merged into your existing install. Exit Claude Code (or open a separate terminal) and run `bash migrate-v2.sh` from the shell."*
|
||||||
3. Wait for the user to confirm before doing anything else. Do not run the migration script yourself — it requires an interactive terminal and must be run by the user with the `!` prefix.
|
3. Wait for the user to confirm before doing anything else. Do not run the migration script yourself — it requires an interactive terminal and cannot be run from within Claude Code.
|
||||||
|
|
||||||
If you are a fresh install (you ran `git clone`, not `git pull`) and there are no conflicts, ignore this banner and continue below.
|
If you are a fresh install (you ran `git clone`, not `git pull`) and there are no conflicts, ignore this banner and continue below.
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,7 @@
|
|||||||
# Run from the v2 directory:
|
# Run from the v2 directory:
|
||||||
# bash migrate-v2.sh
|
# bash migrate-v2.sh
|
||||||
#
|
#
|
||||||
# From Claude Code, use the ! prefix so it runs in your terminal:
|
# If you're in Claude Code, exit first or open a separate terminal.
|
||||||
# ! bash migrate-v2.sh
|
|
||||||
#
|
#
|
||||||
# Finds v1 automatically (sibling directory, or $NANOCLAW_V1_PATH).
|
# Finds v1 automatically (sibling directory, or $NANOCLAW_V1_PATH).
|
||||||
# Installs prerequisites (Node, pnpm, deps) via the existing setup.sh
|
# Installs prerequisites (Node, pnpm, deps) via the existing setup.sh
|
||||||
@@ -26,10 +25,10 @@ cd "$PROJECT_ROOT"
|
|||||||
if ! [ -t 0 ] || ! [ -t 1 ]; then
|
if ! [ -t 0 ] || ! [ -t 1 ]; then
|
||||||
echo "This script requires an interactive terminal."
|
echo "This script requires an interactive terminal."
|
||||||
echo ""
|
echo ""
|
||||||
echo "If you're in Claude Code, run it directly with the ! prefix:"
|
echo "If you're in Claude Code, exit first or open a separate terminal,"
|
||||||
echo " ! bash migrate-v2.sh"
|
echo "then run:"
|
||||||
|
echo " bash migrate-v2.sh"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Or run it in a separate terminal session."
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user