diff --git a/cd.sh b/cd.sh index cdad2e8..626c577 100644 --- a/cd.sh +++ b/cd.sh @@ -573,13 +573,17 @@ ${CD_PYTHON_PACKAGES} cd_write_python_module () { cd_step "Write Python module" cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ -$(cd_echo CD_OPEN CD_DOWN) -$(cd_echo CD_VERT CD_SPLT) -$(cd_echo CD___UP CD_SHUT) +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_OS_ID CD_OS_VERSION) - -CD_STEP = $((CD_STEP+1)) " } @@ -703,15 +707,15 @@ cd_shut () { } cd_split () { - echo "${CD_SPLT}" + echo "${CD_SPLIT}" } cd_step () { CD_STEP=$((CD_STEP+1)) echo -n "\ ${CD_DOWN} -${CD_VERT} ${CD_STEP} ${@} -${CD___UP} +${CD_VERTICAL} ${CD_STEP} ${@} +${CD_UP} " } @@ -751,14 +755,15 @@ CD_PM_APT="apt" CD_PM_DNF="dnf" CD_PM_PACMAN="pacman" -CD_HORIZONTAL="${CD_BOX_HORIZONTAL}╌╌┄┄┈┈" - 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}" +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_UP="${CD_BOX_UP}${CD_HORIZONTAL}" + # run cd_main "${@}" diff --git a/cd/__init__.py b/cd/__init__.py index 840d848..6bb0000 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -76,7 +76,6 @@ def cd_synchronize(): def install_commands(path): - step('Install commands') user = '/usr/local/bin' for command in [ 'browse-workspace', @@ -90,8 +89,6 @@ def install_commands(path): def set_ssh(*arguments): - step('Set SSH') - # ssh_key, ssh_hosts = arguments # ssh_type = 'ed25519' @@ -124,11 +121,11 @@ def shut(*arguments): def split(): - print(env.CD_SPLT, flush=True) + print(env.CD_SPLIT, flush=True) 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_VERTICAL, env.CD_STEP, *arguments) + print(env.CD_UP, flush=True)