Cleanup some todos in SP1 dockerfile (#79)

This commit is contained in:
Han
2025-08-07 22:06:12 +08:00
committed by GitHub
parent 1ad15f7379
commit f281ead60a
2 changed files with 17 additions and 23 deletions

View File

@@ -14,29 +14,27 @@ if ! command -v bash &> /dev/null; then # sp1up script uses bash
fi
# Define default homes if not set, useful for Docker context
DEFAULT_SP1UP_HOME="${HOME}/.sp1up"
DEFAULT_SP1_HOME="${HOME}/.sp1"
DEFAULT_SP1_DIR="${HOME}/.sp1"
# Use existing ENV var or default. Docker ENV will make these available.
# For local use, user might need to add these to their .bashrc/.zshrc
export SP1UP_HOME="${SP1UP_HOME:-${DEFAULT_SP1UP_HOME}}"
export SP1_HOME="${SP1_HOME:-${DEFAULT_SP1_HOME}}"
export SP1_DIR="${SP1_DIR:-${DEFAULT_SP1_DIR}}"
# Run sp1up installer script
curl -L https://sp1up.succinct.xyz | bash -s -- --yes
curl -L https://sp1up.succinct.xyz | bash
# Add sp1up and sp1 binaries to PATH for this script's execution context
# and for subsequent commands if this script is sourced.
export PATH="${SP1UP_HOME}/bin:${SP1_HOME}/bin:$PATH"
export PATH="${SP1_DIR}/bin:$PATH"
export SDK_VERSION="${SP1UP_SDK_INSTALL_VERSION:-latest}"
export SP1_VERSION="${SP1_VERSION:-latest}"
# Run sp1up to install/update the toolchain
if ! command -v sp1up &> /dev/null; then
echo "Error: sp1up command not found after installation script. Check PATH or installation." >&2
exit 1
fi
sp1up -v ${SDK_VERSION} # Installs the toolchain and cargo-prove
sp1up -v ${SP1_VERSION} # Installs the toolchain and cargo-prove
echo "Verifying SP1 installation..."
if ! command -v cargo &> /dev/null; then
@@ -49,7 +47,6 @@ rustup toolchain list | grep succinct || (echo "Error: SP1 Toolchain (succinct)
echo "Succinct SP1 Toolchain installation successful."
echo "If running locally (not in Docker), to make SP1 commands available in your current shell or new shells, ensure the following are in your shell profile (e.g., ~/.bashrc, ~/.zshrc):"
echo " export SP1UP_HOME=\"${SP1UP_HOME}\""
echo " export SP1_HOME=\"${SP1_HOME}\""
echo " export PATH=\"${SP1UP_HOME}/bin:${SP1_HOME}/bin:\$PATH\""
echo "Then source your profile or open a new terminal."
echo " export SP1_DIR=\"${SP1_DIR}\""
echo " export PATH=\"${SP1_DIR}/bin:\$PATH\""
echo "Then source your profile or open a new terminal."