Compare commits

..

5 commits

Author SHA1 Message Date
5fdfd1637b
arg0
All checks were successful
/ job (push) Successful in 5m52s
2024-06-01 20:14:06 +02:00
914ecb28cf
cd_python_module 2024-06-01 20:03:08 +02:00
aa26bce5fa
main 2024-06-01 19:44:01 +02:00
61723d1e1d
gitlab-ci 2024-06-01 19:42:48 +02:00
25567338c4
quotes 2024-06-01 19:39:50 +02:00
17 changed files with 25 additions and 24 deletions

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -7,7 +7,7 @@ jobs:
- name: cd - name: cd
env: env:
CD: ${{secrets.cd}} CD: ${{secrets.cd}}
run: ${{vars.cd}} ${{vars.cd_ssh_hosts}} run: ${{vars.cd}} "${{vars.cd_ssh_hosts}}"
- run: cd-list-environment - run: cd-list-environment
- run: cd-clone-branch - run: cd-clone-branch

View file

@ -1,7 +1,7 @@
image: debian:bookworm image: debian:bookworm
job: job:
script: script:
- source ${CD} - source ${CD} ${CD_SSH_HOSTS}
- cd-list-environment - cd-list-environment
- cd-clone-branch - cd-clone-branch

15
cd.sh
View file

@ -5,8 +5,9 @@ CD_DEFAULT_DNS="\
9.9.9.9 \ 9.9.9.9 \
" "
CD_PYTHON_MODULE="cd"
CD_PYTHON_MODULES="\ CD_PYTHON_MODULES="\
cd \ ${CD_PYTHON_MODULE} \
rwx \ rwx \
" "
@ -35,8 +36,8 @@ cd_main () {
# TODO move to Python # TODO move to Python
cd_install_ssh cd_install_ssh
cd_clean_packages_cache cd_clean_packages_cache
cd_install_python_modules ${CD_PYTHON_MODULES} cd_install_python_modules
cd_execute_python_module ${CD_PYTHON_MODULES} cd_execute_python_module "${@}"
} }
# steps # steps
@ -540,7 +541,7 @@ local url
cd_step "Install Python modules" cd_step "Install Python modules"
root="$(mktemp --directory)" || exit root="$(mktemp --directory)" || exit
echo "${root}" echo "${root}"
for repository in "${@}" ; do for repository in ${CD_PYTHON_MODULES} ; do
cd_split cd_split
url="${CD_PROJECTS_URL}/${repository}" url="${CD_PROJECTS_URL}/${repository}"
echo -n "\ echo -n "\
@ -571,9 +572,9 @@ local self
echo -n "\ echo -n "\
${self} ${self}
${1} ${CD_PYTHON_MODULE}
" "
"${CD_PYTHON_ALIAS}" -m "${1}" "${CD_STEP}" "${self}" "${CD_PYTHON_ALIAS}" -m "${CD_PYTHON_MODULE}" "${@}"
} }
# functions # functions
@ -719,4 +720,4 @@ CD_PM_PACMAN="pacman"
CD_SPLIT="─╌╌┄┄┈┈" CD_SPLIT="─╌╌┄┄┈┈"
# run # run
cd_main "${@}" cd_main

View file

@ -86,8 +86,8 @@ def install_commands(path):
os.symlink(path, os.path.join(user, f'{COMMANDS_PREFIX}{command}')) os.symlink(path, os.path.join(user, f'{COMMANDS_PREFIX}{command}'))
def set_ssh(): def set_ssh(*arguments):
ssh_hosts = projects.environment.get('CD_SSH_HOSTS', None) ssh_hosts = arguments[0]
ssh_key = projects.environment.get('CD', None) ssh_key = projects.environment.get('CD', None)
ssh_type = projects.environment.get('CD_SSH_TYPE', 'ed25519') ssh_type = projects.environment.get('CD_SSH_TYPE', 'ed25519')
# #

View file

@ -10,7 +10,7 @@ if __name__ == '__main__':
command, *arguments = sys.argv command, *arguments = sys.argv
command = os.path.basename(command) command = os.path.basename(command)
if command == '__main__.py': if command == '__main__.py':
cd.set_ssh() cd.set_ssh(*arguments)
cd.install_commands(__file__) cd.install_commands(__file__)
else: else:
command = command.replace('-', '_') command = command.replace('-', '_')