This commit is contained in:
2026-10-10 22:18:04 -04:00
parent cca893b58d
commit 1654e0f867
6 changed files with 110 additions and 50 deletions
+48 -18
View File
@@ -1,6 +1,5 @@
#!/usr/bin/env bash
MILLISECONDS_START=$(echo "$EPOCHREALTIME * 1000" | bc)
get_milliseconds() {
@@ -21,11 +20,6 @@ trap '[[ "$?" == "1" ]] && echo -e "\033[1;31m[jj] ERROR !\033[0m" >&2' EXIT
# export JJ_DATA_DIR="$HOME/.jjDataDir"
mkdir -p $JJ_DATA_DIR
if [[ -e ~/.cargo/bin/rustup ]]; then
export PATH="~/.cargo/bin:${PATH}"
fi
@@ -50,11 +44,38 @@ function findJJSource {
export JJ_SOURCE_DIR=$(findJJSource)
if [[ -e ~/.bun/bin/bun ]]; then
export PATH="~/.bun/bin:${PATH}"
if ! JJ_DATA_DIR=$(bun -e '
const fs = require("fs");
const YAML = require(`${process.env.JJ_SOURCE_DIR}/node_modules/js-yaml`);
try {
const config = YAML.load(fs.readFileSync("jj.yaml", "utf8"));
if (typeof config?.dataFolder !== "string" || !config.dataFolder.trim()) {
throw new Error("jj.yaml must contain a non-empty dataFolder string");
}
process.stdout.write(config.dataFolder);
} catch (error) {
console.error(`[jj] ${error.message}`);
process.exit(1);
}
'); then
exit 1
fi
if [[ "$JJ_DATA_DIR" == "~" ]]; then
JJ_DATA_DIR="$HOME"
elif [[ "$JJ_DATA_DIR" == "~/"* ]]; then
JJ_DATA_DIR="$HOME/${JJ_DATA_DIR:2}"
fi
export JJ_DATA_DIR
mkdir -p "$JJ_DATA_DIR"
if [[ -e "jj.yaml" ]];then
export JJ_WORKSPACE_DIR_TMP=$(pwd)
fi
@@ -77,13 +98,13 @@ fi
__bunVersionExpect="1.3.9"
__currentBunVersion=$(bun --version || true)
if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then
rm -rf ~/.bun/bin/bun
curl -fsSL https://bun.sh/install | bash -s "bun-v$__bunVersionExpect"
export PATH="~/.bun/bin:${PATH}"
fi
# __bunVersionExpect="1.4.3"
# __currentBunVersion=$(bun --version || true)
# if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then
# rm -rf ~/.bun/bin/bun
# curl -fsSL https://bun.sh/install | bash -s "bun-v$__bunVersionExpect"
# export PATH="~/.bun/bin:${PATH}"
# fi
mkdir -p "$JJ_DATA_DIR/~~tmp/deps"
@@ -128,6 +149,10 @@ export JJ_WORKSPACE_CURRENT_BRANCH=$(cd $JJ_WORKSPACE_DIR ; git rev-parse --abbr
export JJ_WORKSPACE_CURRENT_COMMIT_AUTHOR=$(cd $JJ_WORKSPACE_DIR ; git show -s --format='%an %ae' $JJ_WORKSPACE_CURRENT_COMMIT )
export JJ_WORKSPACE_CURRENT_VERSION=$(cat $JJ_WORKSPACE_DIR/package.json | jq -r '.version')
export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
if ! command -v python >/dev/null 2>&1; then
shopt -s expand_aliases
alias python=python3
fi
export JJ_PYTHON_VERSION=$(python --version | awk '{print $2}')
@@ -146,6 +171,11 @@ cat << EOF > "$JJ_WORKSPACE_DIR/active.sh"
#!/bin/bash
if [[ -e "$ASDF_DIR/asdf.sh" ]]; then
source "$ASDF_DIR/asdf.sh"
source "$JJ_DATA_DIR/~~tmp/shEnvs.sh" || true
export JJ_SOURCE_DIR="${JJ_SOURCE_DIR}"
export JJ_DATA_DIR="${JJ_DATA_DIR}"
export JJ_SECRET_TMP_DIR="${JJ_SECRET_TMP_DIR}"
source ${JJ_SOURCE_DIR}/bashUtils/auto-completion.sh
fi
EOF
chmod +x "$JJ_WORKSPACE_DIR/active.sh"
@@ -185,4 +215,4 @@ ${JJ_SOURCE_DIR}/helpers/jjCli.ts $@
# $JJ_SOURCE_DIR/bin/run.ts $@
# $JJ_SOURCE_DIR/bin/run.ts $@