From a3fe03b16f7b4923343d5bf8e905acca41282620 Mon Sep 17 00:00:00 2001 From: Jason Jafari Date: Wed, 18 Dec 2024 22:33:53 -0500 Subject: [PATCH] WIP --- bashUtils/ensureDependency.sh | 2 ++ jj.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bashUtils/ensureDependency.sh b/bashUtils/ensureDependency.sh index fda5766..90bcd0c 100755 --- a/bashUtils/ensureDependency.sh +++ b/bashUtils/ensureDependency.sh @@ -64,6 +64,7 @@ if [[ ! -e $JJ_DATA_DIR/~~tmp/deps/bun-packages-installed ]] \ || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/deps/bun-packages-installed" \ || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/bun.lockb" "$JJ_DATA_DIR/~~tmp/deps/bun-packages-installed" \ ; then + npm version patch --no-git-tag-version pushd $JJ_WORKSPACE_DIR > /dev/null bun install @@ -75,6 +76,7 @@ fi if [[ ! -e $JJ_DATA_DIR/~~tmp/deps/python-packages-installed ]] \ || jjIsFileNewerFile "$JJ_WORKSPACE_DIR/requirements.txt" "$JJ_DATA_DIR/~~tmp/deps/python-packages-installed" \ ; then + npm version patch --no-git-tag-version pushd $JJ_WORKSPACE_DIR > /dev/null pip install -r requirements.txt || pip3 install -r requirements.txt diff --git a/jj.sh b/jj.sh index c8990f1..5e372c6 100755 --- a/jj.sh +++ b/jj.sh @@ -126,7 +126,7 @@ 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") - +export JJ_PYTHON_VERSION=$(python --version | awk '{print $2}') if [[ -e $JJ_WORKSPACE_DIR ]]; then