This commit is contained in:
2024-11-12 22:07:38 -05:00
parent d2d18315c4
commit 59a08dc5ba
12 changed files with 364 additions and 158 deletions
+53 -31
View File
@@ -1,23 +1,27 @@
#!/usr/bin/env zsh
#!/usr/bin/env bash
MILLISECONDS_START=$(echo "$EPOCHREALTIME * 1000" | bc)
get_milliseconds() {
local current_time=$(echo "$EPOCHREALTIME * 1000" | bc)
echo "$(echo "$current_time - $MILLISECONDS_START" | bc | awk '{printf "%.0f", $0}')"
}
set -e
trap '[[ "$?" == "1" ]] && echo -e "\033[1;31m[jj] ERROR !\033[0m" >&2' EXIT
# set +
autoload -U compinit
compinit
# ZSH specific
# autoload -U compinit
# compinit
jjCpmmandRunPoint=$(echo ${BASH_SOURCE[0]})
function findJJSource {
# @source http://stackoverflow.com/a/246128/330439
local SOURCE="$jjCpmmandRunPoint"
@@ -37,10 +41,15 @@ function findJJSource {
export JJ_SOURCE_DIR=$(findJJSource)
if [[ "$1" == "--clean" ]]; then
rm -rf $JJ_SOURCE_DIR/~~tmp/deps
fi
if [[ -e ~/.bun/bin/bun ]]; then
export PATH="~/.bun/bin:${PATH}"
fi
@@ -53,38 +62,42 @@ if [[ "$__currentBunVersion" != "${__bunVersionExpect}" ]]; then
export PATH="~/.bun/bin:${PATH}"
fi
mkdir -p "$JJ_SOURCE_DIR/~~tmp/deps"
alias jj="$JJ_SOURCE_DIR/jj.sh"
source "$JJ_SOURCE_DIR/bashUtils/index.sh"
if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/configSaveFilePath.txt" ]]; then
$JJ_SOURCE_DIR/helpers/jjEnsure.ts init
fi
# $JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs
# exit 0
eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs)
# echo $JJ_WORKSPACE_DIR
if [[ ! -e "$JJ_SOURCE_DIR/~~tmp/configSaveFilePath.txt" ]]; then
$JJ_SOURCE_DIR/helpers/jjEnsure.ts init
fi
# jjCliLog jjLog testjjLog a b c s
# jjCliLog jjLogInfo testjjLogInfo
# jjCliLog jjLogHeading testjjLogHeading
if [[ -e "$JJ_SOURCE_DIR/~~tmp/shEnvs.sh" ]]; then
source $JJ_SOURCE_DIR/~~tmp/shEnvs.sh
fi
source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh"
# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@
eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ )
set -- $(echo $JJ_CLI_COMMANDS)
echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE
if [[ ! -e "$JJ_SOURCE_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" \
; 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
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)
@@ -93,18 +106,27 @@ export JJ_WORKSPACE_CURRENT_VERSION=$(cat $JJ_WORKSPACE_DIR/package.json | jq -r
export JJ_WORKSPACE_CURRENT_ISO_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
if [[ -z "$JJ_CLI_OPTION_COMMIT" ]]; then
export JJ_CLI_SELECTED_COMMIT=$JJ_WORKSPACE_CURRENT_COMMIT
else
export JJ_CLI_SELECTED_COMMIT=$JJ_CLI_OPTION_COMMIT
fi
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)
# echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE
# if [[ ! -e $JJ_SOURCE_DIR/~~tmp/pa ]]; then
# echo "asdadasd"
# fi
${JJ_SOURCE_DIR}/helpers/jjCli.ts
${JJ_SOURCE_DIR}/helpers/jjCli.ts $@