ref: refactored scripts

dev.sh

@@ -3,13 +3,16 @@ set -euo pipefail
 
 SCRIPT_DIR=$(realpath -- "$(dirname -- "${BASH_SOURCE[0]}")")
 
-BASE_DIR="${OPENCODE_DEV_HOME:-$HOME/opencode-dev}"
 IMAGE_REPO="${IMAGE_REPO:-localhost/opencode-dev}"
-# OPENCODE_VERSION="${OPENCODE_VERSION:-1.18.32}"
-# IMAGE_TAG="${IMAGE_TAG:-${OPENCODE_VERSION}}"
 IMAGE="${IMAGE_REPO}"
 
+if ! podman image exists "$IMAGE"; then
+  echo "Image $IMAGE does not exist. Build it first with ./build.sh" >&2
+  exit 1
+fi
+
 # Folders
+BASE_DIR="${OPENCODE_DEV_HOME:-$HOME/opencode-dev}"
 PROJECTS_DIR="${PROJECT_DIR:-$BASE_DIR/projects}"
 OPC_CONFIG="${OPENCODE_CONFIG:-$BASE_DIR/opencode-config}"
 OPC_DATA="${OPENCODE_SHARE_DATA:-$BASE_DIR/opencode-data}"
@@ -18,7 +21,11 @@ M2_FOLDER="${M2_FOLDER:-$BASE_DIR/m2}"
 NPM_MODULES="${NPM_MODULES:-$BASE_DIR/npm-modules}"
 NPM_CACHE="${NPM_CACHE:-$BASE_DIR/npm-cache}"
 PIP_CACHE="${PIP_CACHE:-$BASE_DIR/pip-cache}"
-BASH_FOLDER="${BASH_FOLDER:-$BASE_DIR/bash}"
+
+if [[ ! -d "$PROJECTS_DIR" ]]; then
+  echo "Project directory missing: $PROJECTS_DIR" >&2
+  exit 1
+fi
 
 mkdir -p \
     "$BASE_DIR" \
@@ -29,17 +36,7 @@ mkdir -p \
     "$M2_FOLDER" \
     "$NPM_MODULES" \
     "$NPM_CACHE" \
-    "$PIP_CACHE" \
-    "$BASH_FOLDER"
-
-if [[ ! -f "$HOME/.gitconfig" ]]; then
-  echo "WARNING: $HOME/.gitconfig does not exist; Git will use container defaults." >&2
-fi
-
-if ! podman image exists "$IMAGE"; then
-  echo "Image $IMAGE does not exist. Build it first with ./build.sh" >&2
-  exit 1
-fi
+    "$PIP_CACHE"
 
 START_DIR="${1:-$PROJECTS_DIR}"
 shift || true
@@ -56,11 +53,6 @@ else
   START_DIR="/workspace/${START_DIR#./}"
 fi
 
-if [[ ! -d "$PROJECTS_DIR" ]]; then
-  echo "Project directory missing: $PROJECTS_DIR" >&2
-  exit 1
-fi
-
 ARGS=(
   run --rm -it
   --name opencode-dev
@@ -83,18 +75,14 @@ ARGS=(
   -v "$NPM_CACHE:/home/dev/.npm:rw"
   -v "$PIP_CACHE:/home/dev/.cache/pip:rw"
   -v "$PROJECTS_DIR:/workspace:rw"
-  -v "$HOME/.gitconfig:/home/dev/.gitconfig:ro"
-  # -v "$HOME/.ssh:/home/dev/.ssh:ro"
-  -v "$BASH_FOLDER:/host-bash:ro"
   -v "$SCRIPT_DIR/entrypoint.sh:/usr/local/bin/opencode-dev-entrypoint:ro"
 )
 
-# if [[ -n "${SSH_AUTH_SOCK:-}" && -S "$SSH_AUTH_SOCK" ]]; then
-#   ARGS+=(
-#     -e SSH_AUTH_SOCK=/tmp/ssh-agent.sock
-#     -v "$SSH_AUTH_SOCK:/tmp/ssh-agent.sock"
-#   )
-# fi
+if [[ -f "$HOME/.gitconfig" ]]; then
+  ARGS+=(-v "$HOME/.gitconfig:/home/dev/.gitconfig:ro")
+else
+  echo "WARNING: host .gitconfig not found"
+fi
 
 # Additional bind mounts:
 #   ./dev.sh /project --mount "$HOME/other:/extra"