Skip to content

add flexible venv logic to rust server installation #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
remytuyeras merged 1 commit into from
Dec 26, 2025
Merged

add flexible venv logic to rust server installation #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions reinstall_python_sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,20 @@ if [ ! -f "$RUST_SCRIPT" ]; then
fi

if [ "$DEV_CORE" = true ]; then
bash "$RUST_SCRIPT" "$PREFIX_FILTER" --dev-core
if [[ -n "${VENV_OVERRIDE:-}" ]]; then
bash "$RUST_SCRIPT" "$PREFIX_FILTER" --dev-core --venv "$VENV_DIR"
else
bash "$RUST_SCRIPT" "$PREFIX_FILTER" --dev-core
fi
else
bash "$RUST_SCRIPT" "$PREFIX_FILTER"
if [[ -n "${VENV_OVERRIDE:-}" ]]; then
bash "$RUST_SCRIPT" "$PREFIX_FILTER" --venv "$VENV_DIR"
else
bash "$RUST_SCRIPT" "$PREFIX_FILTER"
fi
fi


# ─────────────────────────────────────────────────────────────
# Reinstall Python package in editable mode
# ─────────────────────────────────────────────────────────────
Expand Down
42 changes: 38 additions & 4 deletions reinstall_rust_server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,61 @@ THIS_SCRIPT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOT_DIR="$(cd "$THIS_SCRIPT/.." && pwd)"

# ─────────────────────────────────────────────────────────────
# Parse args: [--dev-core] [<optional-prefix>]
# Parse args: [--dev-core] [<optional-prefix>] [--venv <path>]
# ─────────────────────────────────────────────────────────────
DEV_CORE=false
PREFIX_FILTER=""
VENV_OVERRIDE=""

echo "🔍 Raw arguments: $*"

prev=""
for arg in "$@"; do
if [[ "$arg" == "--dev-core" ]]; then
DEV_CORE=true
elif [[ "$prev" == "--venv" ]]; then
VENV_OVERRIDE="$arg"
prev=""
continue
elif [[ "$arg" == "--venv" ]]; then
prev="--venv"
elif [[ -z "$PREFIX_FILTER" && "$arg" != --* ]]; then
PREFIX_FILTER="$arg"
fi
done

echo "✅ Final values: DEV_CORE=$DEV_CORE, PREFIX_FILTER=$PREFIX_FILTER"
if [[ "$prev" == "--venv" ]]; then
echo "❌ --venv requires a value, e.g. --venv .venv"
exit 1
fi

echo "✅ Final values: DEV_CORE=$DEV_CORE, PREFIX_FILTER=$PREFIX_FILTER, VENV_OVERRIDE=$VENV_OVERRIDE"

# ─────────────────────────────────────────────────────────────
# Select venv location
# ─────────────────────────────────────────────────────────────
if [ "$DEV_CORE" = true ]; then
if [[ -n "$VENV_OVERRIDE" ]]; then
# Align with reinstall_python_sdk.sh:
# - absolute path: use as-is
# - relative path: resolve relative to ROOT_DIR
if [[ "$VENV_OVERRIDE" == /* ]]; then
VENV_DIR="$VENV_OVERRIDE"
else
VENV_DIR="$ROOT_DIR/$VENV_OVERRIDE"
fi
VENV_DIR="${VENV_DIR%/}"
elif [ "$DEV_CORE" = true ]; then
VENV_DIR="$THIS_SCRIPT/venv"
else
VENV_DIR="$ROOT_DIR/venv"
fi

# Guard against empty path
if [[ -z "${VENV_DIR:-}" ]]; then
echo "❌ Resolved VENV_DIR is empty. Check your --venv value."
exit 1
fi

# ─────────────────────────────────────────────────────────────
# Activate virtualenv
# ─────────────────────────────────────────────────────────────
Expand All @@ -44,6 +73,9 @@ if [ -f "$VENV_DIR/bin/activate" ]; then
. "$VENV_DIR/bin/activate"
else
echo "❌ Virtualenv not found at: $VENV_DIR"
echo " Tips:"
echo " - pass --venv .venv (or your venv path)"
echo " - or create the venv at that location"
exit 1
fi

Expand Down Expand Up @@ -92,7 +124,9 @@ if [ "$FOUND" -eq 0 ]; then
fi

echo
if [ "$DEV_CORE" = true ]; then
if [[ -n "$VENV_OVERRIDE" ]]; then
echo "ℹ️ Completed with --venv (venv at $VENV_DIR)"
elif [ "$DEV_CORE" = true ]; then
echo "ℹ️ Completed with --dev-core (venv at $THIS_SCRIPT/venv)"
else
echo "ℹ️ Completed with default venv (venv at $ROOT_DIR/venv)"
Expand Down