diff --git a/cd.sh b/cd.sh index b64ce20..70add07 100644 --- a/cd.sh +++ b/cd.sh @@ -575,28 +575,12 @@ cd_write_python_module () { cd_write "${CD_PYTHON_PACKAGES}/env.py" "\ $(cd_echo CD_OS_ID CD_OS_VERSION) -STEP = ${CD_STEP} +$(cd_echo CD_OPEN CD_SHUT) -def open(*arguments): - print('${CD_OPEN}', end=str()) - print(*arguments, flush=True) +$(cd_echo CD_HORIZONTAL) - -def shut(*arguments): - print('${CD_SHUT}', end=str()) - print(*arguments, flush=True) - - -def split(): - print('${CD_SPLIT}', flush=True) - - -def step(*arguments): - STEP += 1 - print('${CD_DOWN}') - print('${CD_BOX_VERTICAL}', STEP, *arguments) - print('${CD_UP}', flush=True) +$(cd_echo CD_DOWN CD_SPLIT CD_UP) " } @@ -615,11 +599,18 @@ ${CD_GIT_CHILD} # functions +cd_box_open () { + echo "${CD_OPEN}${@}" +} +cd_box_shut () { + echo "${CD_SHUT}${@}" +} + cd_cat () { if [ -f "${1}" ] ; then - cd_open "${1}" + cd_box_open "${1}" cat "${1}" || exit - cd_shut "${1}" + cd_box_shut "${1}" fi } @@ -669,9 +660,9 @@ local command="${1}" cd_ls () { if [ -d "${1}" ] ; then - cd_open "${1}" + cd_box_open "${1}" ls -a -l "${1}" || exit - cd_shut "${1}" + cd_box_shut "${1}" fi } @@ -682,10 +673,6 @@ cd_mkdir () { fi } -cd_open () { - echo "${CD_OPEN}${@}" -} - cd_openssl () { local file="${1}" if [ -f "${file}" ] ; then @@ -715,10 +702,6 @@ shift fi } -cd_shut () { - echo "${CD_SHUT}${@}" -} - cd_split () { echo "${CD_SPLIT}" }