This commit is contained in:
2024-11-14 16:11:00 -05:00
parent b4a8dd848a
commit 1af25d6c61
7 changed files with 199 additions and 62 deletions
+24 -19
View File
@@ -19,6 +19,10 @@ trap '[[ "$?" == "1" ]] && echo -e "\033[1;31m[jj] ERROR !\033[0m" >&2' EXIT
# compinit
export JJ_DATA_DIR="$HOME/.jjDataDir"
mkdir -p $JJ_DATA_DIR
jjCpmmandRunPoint=$(echo ${BASH_SOURCE[0]})
@@ -44,10 +48,15 @@ export JJ_SOURCE_DIR=$(findJJSource)
if [[ "$1" == "--clean" ]]; then
rm -rf $JJ_SOURCE_DIR/~~tmp/deps
fi
if [[ "$1" == "help" ]]; then
if [[ "$2" == "change-workspace" ]]; then
rm -rf $JJ_DATA_DIR/~~tmp/configSaveFilePath.txt
fi
if [[ "$2" == "clean-workspace" ]]; then
rm -rf $JJ_DATA_DIR/~~tmp/deps
fi
fi
if [[ -e ~/.bun/bin/bun ]]; then
@@ -62,7 +71,7 @@ if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then
export PATH="~/.bun/bin:${PATH}"
fi
mkdir -p "$JJ_SOURCE_DIR/~~tmp/deps"
mkdir -p "$JJ_DATA_DIR/~~tmp/deps"
alias jj="$JJ_SOURCE_DIR/jj.sh"
@@ -70,34 +79,30 @@ source "$JJ_SOURCE_DIR/bashUtils/index.sh"
if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/configSaveFilePath.txt" ]]; then
if [[ ! -e "$JJ_DATA_DIR/~~tmp/configSaveFilePath.txt" ]]; then
$JJ_SOURCE_DIR/helpers/jjEnsure.ts init
fi
# $JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs
# exit 0
$JJ_SOURCE_DIR/helpers/jjEnsure.ts init
if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/configSaveFilePath.txt" ]]; then
$JJ_SOURCE_DIR/helpers/jjEnsure.ts init
fi
if [[ -e "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" ]]; then
source $JJ_SOURCE_DIR/~~tmp/shEnvs.sh
if [[ -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]]; then
source $JJ_DATA_DIR/~~tmp/shEnvs.sh
fi
if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" ]] \
if [[ ! -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]] \
|| [[ -z $JJ_WORKSPACE_DIR ]] \
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/jj.yaml" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_SOURCE_DIR/~~tmp/jjConfigs.json" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_SOURCE_DIR/package.json" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/jj.yaml" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_DATA_DIR/~~tmp/jjConfigs.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_SOURCE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
; then
MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 01 $MILLISECONDS"
eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs)
MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 02 $MILLISECONDS"
fi
source $JJ_SOURCE_DIR/~~tmp/shEnvs.sh
source $JJ_DATA_DIR/~~tmp/shEnvs.sh
export JJ_WORKSPACE_CURRENT_COMMIT=$(cd $JJ_WORKSPACE_DIR ; git rev-parse HEAD)
export JJ_WORKSPACE_CURRENT_BRANCH=$(cd $JJ_WORKSPACE_DIR ; git rev-parse --abbrev-ref HEAD)
@@ -134,7 +139,7 @@ source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh"
# if [[ ! -e $JJ_SOURCE_DIR/~~tmp/pa ]]; then
# if [[ ! -e $JJ_DATA_DIR/~~tmp/pa ]]; then
# echo "asdadasd"
# fi