WIP
This commit is contained in:
@@ -3,7 +3,8 @@
|
|||||||
import yargs from "yargs";
|
import yargs from "yargs";
|
||||||
import { hideBin } from "yargs/helpers";
|
import { hideBin } from "yargs/helpers";
|
||||||
import fs from "fs-extra";
|
import fs from "fs-extra";
|
||||||
import { jjConfigsExp } from "./jjConfigUtils";
|
import { getJJConfigByKeyChain, jjConfigsExp } from "./jjConfigUtils";
|
||||||
|
import { dynamicStringHandler } from '@jjHelpers/dynamicStringHandler';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -77,13 +78,18 @@ export const jjCliYargs = (cli = true) => {
|
|||||||
});
|
});
|
||||||
envsObj[`JJ_CLI_OPTIONS`] = JSON.stringify(allOptionsMap)
|
envsObj[`JJ_CLI_OPTIONS`] = JSON.stringify(allOptionsMap)
|
||||||
|
|
||||||
if(!envsObj['JJ_CLI_OPTION_COMMIT']){
|
if (!envsObj['JJ_CLI_OPTION_COMMIT']) {
|
||||||
envsObj['JJ_CLI_SELECTED_COMMIT'] = process.env['JJ_WORKSPACE_CURRENT_COMMIT']
|
envsObj['JJ_CLI_SELECTED_COMMIT'] = process.env['JJ_WORKSPACE_CURRENT_COMMIT']
|
||||||
} else {
|
} else {
|
||||||
envsObj['JJ_CLI_SELECTED_COMMIT'] = envsObj['JJ_CLI_OPTION_COMMIT']
|
envsObj['JJ_CLI_SELECTED_COMMIT'] = envsObj['JJ_CLI_OPTION_COMMIT']
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const jjCommandConfig = getJJConfigByKeyChain(`commands['${envsObj['JJ_CLI_ARG_1']}']`)
|
||||||
|
envsObj['JJ_CLI_SCRIPT_TO_RUN_PRE_PATH'] = dynamicStringHandler(`${jjCommandConfig.scriptToRun.prePath}`, "", process.env, false)
|
||||||
|
envsObj['JJ_CLI_SCRIPT_TO_RUN_PATH'] = dynamicStringHandler(`${jjCommandConfig.scriptToRun.path}`, "", process.env, false)
|
||||||
|
envsObj['JJ_CLI_SCRIPT_TO_RUN_TYPE'] = jjCommandConfig.scriptToRun?.type || 'bun'
|
||||||
|
|
||||||
if (cli) {
|
if (cli) {
|
||||||
Object.keys(envsObj).forEach(envKey => {
|
Object.keys(envsObj).forEach(envKey => {
|
||||||
console.log(`export ${envKey}="${envsObj[envKey]}"`)
|
console.log(`export ${envKey}="${envsObj[envKey]}"`)
|
||||||
@@ -102,7 +108,7 @@ export const jjCliYargs = (cli = true) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(process.argv[process.argv.length - 1]== "cli"){
|
if (process.argv[process.argv.length - 1] == "cli") {
|
||||||
process.argv.pop()
|
process.argv.pop()
|
||||||
jjCliYargs()
|
jjCliYargs()
|
||||||
}
|
}
|
||||||
@@ -92,12 +92,12 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
if [[ ! -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]] \
|
if [[ ! -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]] \
|
||||||
|| [[ -z $JJ_WORKSPACE_DIR ]] \
|
|| [[ -z $JJ_WORKSPACE_DIR ]] \
|
||||||
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/jj.yaml" "$JJ_DATA_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_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_SOURCE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
|
||||||
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
|
|| jjIsFileNewerFile "$JJ_WORKSPACE_DIR/package.json" "$JJ_DATA_DIR/~~tmp/shEnvs.sh" \
|
||||||
; then
|
; then
|
||||||
MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 01 $MILLISECONDS"
|
MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 01 $MILLISECONDS"
|
||||||
eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs)
|
eval $($JJ_SOURCE_DIR/helpers/jjEnsure.ts returnProcessEnvs)
|
||||||
MILLISECONDS=$(get_milliseconds) ; echo "returnProcessEnvs 02 $MILLISECONDS"
|
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
|
if [[ -e $JJ_WORKSPACE_DIR ]]; then
|
||||||
|
|
||||||
# pushd "${JJ_GIT_METADATA_DIR}/" > /dev/null
|
# pushd "${JJ_GIT_METADATA_DIR}/" > /dev/null
|
||||||
# git pull origin > /dev/null &
|
# git pull origin > /dev/null &
|
||||||
# popd > /dev/null
|
# popd > /dev/null
|
||||||
@@ -131,19 +130,17 @@ source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh"
|
|||||||
# echo 2
|
# echo 2
|
||||||
# # exit 0
|
# # exit 0
|
||||||
# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@
|
# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@
|
||||||
# eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli)
|
eval $(${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli)
|
||||||
# set -- $(echo $JJ_CLI_COMMANDS)
|
set -- $(echo $JJ_CLI_COMMANDS)
|
||||||
|
|
||||||
# echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE
|
# echo $JJ_CLI_ADDITIONAL_ARGS_COMMA_SEPTATE
|
||||||
|
|
||||||
|
|
||||||
|
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
|
||||||
# if [[ ! -e $JJ_DATA_DIR/~~tmp/pa ]]; then
|
fi
|
||||||
# echo "asdadasd"
|
|
||||||
# fi
|
|
||||||
|
|
||||||
${JJ_SOURCE_DIR}/helpers/jjCli.ts $@
|
${JJ_SOURCE_DIR}/helpers/jjCli.ts $@
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "jj-command-line",
|
"name": "jj-command-line",
|
||||||
"description": "jj cli",
|
"description": "jj cli",
|
||||||
"version": "1.0.15",
|
"version": "1.0.16",
|
||||||
"author": "Jason Jafari",
|
"author": "Jason Jafari",
|
||||||
"bin": {
|
"bin": {
|
||||||
"jj": "./jj.sh"
|
"jj": "./jj.sh"
|
||||||
|
|||||||
Reference in New Issue
Block a user