This commit is contained in:
2024-11-22 20:13:44 -05:00
parent 0fc0e9d4de
commit 7bd11ad19b
3 changed files with 23 additions and 20 deletions
+13 -16
View File
@@ -92,12 +92,12 @@ fi
if [[ ! -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]] \
|| [[ -z $JJ_WORKSPACE_DIR ]] \
|| 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
|| [[ -z $JJ_WORKSPACE_DIR ]] \
|| 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"
@@ -113,7 +113,6 @@ export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
if [[ -e $JJ_WORKSPACE_DIR ]]; then
# pushd "${JJ_GIT_METADATA_DIR}/" > /dev/null
# git pull origin > /dev/null &
# popd > /dev/null
@@ -131,19 +130,17 @@ source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh"
# echo 2
# # exit 0
# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@
# eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli)
# set -- $(echo $JJ_CLI_COMMANDS)
eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli)
set -- $(echo $JJ_CLI_COMMANDS)
# echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE
# if [[ ! -e $JJ_DATA_DIR/~~tmp/pa ]]; then
# echo "asdadasd"
# fi
if [[ "$JJ_CLI_SCRIPT_TO_RUN_TYPE" == "bash" ]]; then
cd $JJ_CLI_SCRIPT_TO_RUN_PRE_PATH
./${JJ_CLI_SCRIPT_TO_RUN_PATH}
exit 0
fi
${JJ_SOURCE_DIR}/helpers/jjCli.ts $@