From 2c85bcc6bc0cc509630cac83337efe409ac6a4b7 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 14:37:23 +0200 Subject: [PATCH 1/8] rejigger --- cd.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cd.sh b/cd.sh index 626c577..1e1dba4 100644 --- a/cd.sh +++ b/cd.sh @@ -575,13 +575,11 @@ cd_write_python_module () { cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ CD_STEP = ${CD_STEP} - -$(cd_echo CD_DOWN CD_VERTICAL CD_UP) - -$(cd_echo CD_OPEN CD_SHUT) - -$(cd_echo CD_SPLIT) - +$(cd_echo CD_OPEN) +$(cd_echo CD_DOWN) +$(cd_echo CD_VERTICAL CD_SPLIT) +$(cd_echo CD_UP) +$(cd_echo CD_SHUT) $(cd_echo CD_OS_ID CD_OS_VERSION) " From b6b8e03b507e82462b27a9f23207b9b1387d4841 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 14:46:56 +0200 Subject: [PATCH 2/8] splt --- cd.sh | 6 +++--- cd/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index 1e1dba4..8a08afe 100644 --- a/cd.sh +++ b/cd.sh @@ -577,7 +577,7 @@ CD_STEP = ${CD_STEP} $(cd_echo CD_OPEN) $(cd_echo CD_DOWN) -$(cd_echo CD_VERTICAL CD_SPLIT) +$(cd_echo CD_VERTICAL CD_SPLT) $(cd_echo CD_UP) $(cd_echo CD_SHUT) @@ -705,7 +705,7 @@ cd_shut () { } cd_split () { - echo "${CD_SPLIT}" + echo "${CD_SPLT}" } cd_step () { @@ -760,7 +760,7 @@ CD_HORIZONTAL="${CD_BOX_HORIZONTAL}╌╌┄┄┈┈" CD_VERTICAL="${CD_BOX_VERTICAL}" CD_DOWN="${CD_BOX_DOWN}${CD_HORIZONTAL}" -CD_SPLIT="${CD_BOX_RIGHT}${CD_HORIZONTAL}" +CD_SPLT="${CD_BOX_RIGHT}${CD_HORIZONTAL}" CD_UP="${CD_BOX_UP}${CD_HORIZONTAL}" # run diff --git a/cd/__init__.py b/cd/__init__.py index 6bb0000..97c2196 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -121,7 +121,7 @@ def shut(*arguments): def split(): - print(env.CD_SPLIT, flush=True) + print(env.CD_SPLT, flush=True) def step(*arguments): From 50b2fbfeef38e66db56a2b70b3876652ae074150 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 14:48:19 +0200 Subject: [PATCH 3/8] vert --- cd.sh | 6 +++--- cd/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index 8a08afe..1d4b2c5 100644 --- a/cd.sh +++ b/cd.sh @@ -577,7 +577,7 @@ CD_STEP = ${CD_STEP} $(cd_echo CD_OPEN) $(cd_echo CD_DOWN) -$(cd_echo CD_VERTICAL CD_SPLT) +$(cd_echo CD_VERT CD_SPLT) $(cd_echo CD_UP) $(cd_echo CD_SHUT) @@ -712,7 +712,7 @@ cd_step () { CD_STEP=$((CD_STEP+1)) echo -n "\ ${CD_DOWN} -${CD_VERTICAL} ${CD_STEP} ${@} +${CD_VERT} ${CD_STEP} ${@} ${CD_UP} " } @@ -757,7 +757,7 @@ CD_OPEN="${CD_BOX_DOWN}${CD_BOX_LEFT}" CD_SHUT="${CD_BOX_UP}${CD_BOX_LEFT}" CD_HORIZONTAL="${CD_BOX_HORIZONTAL}╌╌┄┄┈┈" -CD_VERTICAL="${CD_BOX_VERTICAL}" +CD_VERT="${CD_BOX_VERTICAL}" CD_DOWN="${CD_BOX_DOWN}${CD_HORIZONTAL}" CD_SPLT="${CD_BOX_RIGHT}${CD_HORIZONTAL}" diff --git a/cd/__init__.py b/cd/__init__.py index 97c2196..f3ab569 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -127,5 +127,5 @@ def split(): def step(*arguments): env.CD_STEP += 1 print(env.CD_DOWN) - print(env.CD_VERTICAL, env.CD_STEP, *arguments) + print(env.CD_VERT, env.CD_STEP, *arguments) print(env.CD_UP, flush=True) From 4d61f043440691e03c9d5eebab46f4c02e57372d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 14:49:24 +0200 Subject: [PATCH 4/8] up --- cd.sh | 6 +++--- cd/__init__.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index 1d4b2c5..5b78f97 100644 --- a/cd.sh +++ b/cd.sh @@ -578,7 +578,7 @@ CD_STEP = ${CD_STEP} $(cd_echo CD_OPEN) $(cd_echo CD_DOWN) $(cd_echo CD_VERT CD_SPLT) -$(cd_echo CD_UP) +$(cd_echo CD___UP) $(cd_echo CD_SHUT) $(cd_echo CD_OS_ID CD_OS_VERSION) @@ -713,7 +713,7 @@ cd_step () { echo -n "\ ${CD_DOWN} ${CD_VERT} ${CD_STEP} ${@} -${CD_UP} +${CD___UP} " } @@ -761,7 +761,7 @@ CD_VERT="${CD_BOX_VERTICAL}" CD_DOWN="${CD_BOX_DOWN}${CD_HORIZONTAL}" CD_SPLT="${CD_BOX_RIGHT}${CD_HORIZONTAL}" -CD_UP="${CD_BOX_UP}${CD_HORIZONTAL}" +CD___UP="${CD_BOX_UP}${CD_HORIZONTAL}" # run cd_main "${@}" diff --git a/cd/__init__.py b/cd/__init__.py index f3ab569..c4cccff 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -128,4 +128,4 @@ def step(*arguments): env.CD_STEP += 1 print(env.CD_DOWN) print(env.CD_VERT, env.CD_STEP, *arguments) - print(env.CD_UP, flush=True) + print(env.CD___UP, flush=True) From 9fea2acbfd4f6b252b87589743355442adc28dcd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 14:50:13 +0200 Subject: [PATCH 5/8] rejigger --- cd.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cd.sh b/cd.sh index 5b78f97..6b133ff 100644 --- a/cd.sh +++ b/cd.sh @@ -753,15 +753,14 @@ CD_PM_APT="apt" CD_PM_DNF="dnf" CD_PM_PACMAN="pacman" -CD_OPEN="${CD_BOX_DOWN}${CD_BOX_LEFT}" -CD_SHUT="${CD_BOX_UP}${CD_BOX_LEFT}" - CD_HORIZONTAL="${CD_BOX_HORIZONTAL}╌╌┄┄┈┈" -CD_VERT="${CD_BOX_VERTICAL}" +CD_OPEN="${CD_BOX_DOWN}${CD_BOX_LEFT}" CD_DOWN="${CD_BOX_DOWN}${CD_HORIZONTAL}" +CD_VERT="${CD_BOX_VERTICAL}" CD_SPLT="${CD_BOX_RIGHT}${CD_HORIZONTAL}" CD___UP="${CD_BOX_UP}${CD_HORIZONTAL}" +CD_SHUT="${CD_BOX_UP}${CD_BOX_LEFT}" # run cd_main "${@}" From 0e585adc7cba49fccb99ed3f1984511f1b8016f2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 16:55:29 +0200 Subject: [PATCH 6/8] ++ --- cd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 6b133ff..1c0574c 100644 --- a/cd.sh +++ b/cd.sh @@ -573,7 +573,7 @@ ${CD_PYTHON_PACKAGES} cd_write_python_module () { cd_step "Write Python module" cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ -CD_STEP = ${CD_STEP} +CD_STEP = $((CD_STEP+1)) $(cd_echo CD_OPEN) $(cd_echo CD_DOWN) From d5e80084176901c5607dc81d08b05325438e7653 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 17:02:08 +0200 Subject: [PATCH 7/8] step --- cd.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cd.sh b/cd.sh index 1c0574c..cdad2e8 100644 --- a/cd.sh +++ b/cd.sh @@ -573,15 +573,13 @@ ${CD_PYTHON_PACKAGES} cd_write_python_module () { cd_step "Write Python module" cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ -CD_STEP = $((CD_STEP+1)) - -$(cd_echo CD_OPEN) -$(cd_echo CD_DOWN) +$(cd_echo CD_OPEN CD_DOWN) $(cd_echo CD_VERT CD_SPLT) -$(cd_echo CD___UP) -$(cd_echo CD_SHUT) +$(cd_echo CD___UP CD_SHUT) $(cd_echo CD_OS_ID CD_OS_VERSION) + +CD_STEP = $((CD_STEP+1)) " } From 4e9a2f3804857a52b40bd5c780db0c01c33121f2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 5 Jun 2024 17:04:06 +0200 Subject: [PATCH 8/8] steps --- cd/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cd/__init__.py b/cd/__init__.py index c4cccff..840d848 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -76,6 +76,7 @@ def cd_synchronize(): def install_commands(path): + step('Install commands') user = '/usr/local/bin' for command in [ 'browse-workspace', @@ -89,6 +90,8 @@ def install_commands(path): def set_ssh(*arguments): + step('Set SSH') + # ssh_key, ssh_hosts = arguments # ssh_type = 'ed25519'