This commit is contained in:
2024-12-16 03:09:10 -05:00
parent 5ff6ac9251
commit 926d25a9cc
4 changed files with 48 additions and 4 deletions
+10
View File
@@ -9,6 +9,16 @@ for osDependency in $OS_DEPENDENCIES ; do
done
if ! hash rustup ; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
fi
if [[ -e ~/.cargo/bin/rustup ]]; then
export PATH="~/.cargo/bin:${PATH}"
fi
if [[ -e $ASDF_DIR/asdf.sh ]]; then
+8
View File
@@ -200,6 +200,14 @@ export const jjEnsure = async ({ returnProcessEnvs = false }) => {
path: "cli/help.ts",
},
},
c: {
desc: "Command",
mainTitle: "c",
postCommand: "",
maxLength: 12,
keys: [
],
},
secrets: {
desc: "Secrets",
mainTitle: "Secrets",
+29 -3
View File
@@ -23,6 +23,11 @@ export JJ_DATA_DIR="$HOME/.jjDataDir"
mkdir -p $JJ_DATA_DIR
if [[ -e ~/.cargo/bin/rustup ]]; then
export PATH="~/.cargo/bin:${PATH}"
fi
jjCpmmandRunPoint=$(echo ${BASH_SOURCE[0]})
@@ -47,6 +52,15 @@ export JJ_SOURCE_DIR=$(findJJSource)
if [[ -e ~/.bun/bin/bun ]]; then
export PATH="~/.bun/bin:${PATH}"
fi
if [[ -e ~/.cargo/bin/rustup ]]; then
export PATH="~/.cargo/bin:${PATH}"
fi
if [[ "$1" == "help" ]]; then
@@ -59,9 +73,9 @@ if [[ "$1" == "help" ]]; then
fi
if [[ -e ~/.bun/bin/bun ]]; then
export PATH="~/.bun/bin:${PATH}"
fi
__bunVersionExpect="1.1.34"
__currentBunVersion=$(bun --version || true)
@@ -91,6 +105,9 @@ if [[ -e "$JJ_DATA_DIR/~~tmp/shEnvs.sh" ]]; then
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" \
@@ -127,6 +144,14 @@ fi
source "$JJ_SOURCE_DIR/bashUtils/ensureDependency.sh"
if [[ "$1" == "c" ]]; then
"${@:2}"
exit 0
fi
# echo 2
# # exit 0
# ${JJ_SOURCE_DIR}/helpers/jjCliYargs.ts $@ cli
@@ -136,6 +161,7 @@ set -- $(echo $JJ_CLI_COMMANDS)
# 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}
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "jj-command-line",
"description": "jj cli",
"version": "1.0.21",
"version": "1.0.22",
"author": "Jason Jafari",
"bin": {
"jj": "./jj.sh"