diff --git a/cd.sh b/cd.sh index dbbfd8f..c083c09 100644 --- a/cd.sh +++ b/cd.sh @@ -4,7 +4,7 @@ CD_DNS_SERVERS=( '9.9.9.9' ) CD_NAME='cd' -CD_PROJECTS_PARENT='rwx' +CD_REPOSITORIES_PARENT='rwx' function cd_set_environment { CD_DNS_FILE='/etc/resolv.conf' @@ -235,7 +235,7 @@ local root cd_step "${FUNCNAME}" root="$(mktemp --directory)" || exit for repository in \ - "${CD_PROJECTS_PARENT}" \ + "${CD_REPOSITORIES_PARENT}" \ "${CD_NAME}" \ ; do git clone \ @@ -250,7 +250,7 @@ local root function cd_bootstrap { cd_step "${FUNCNAME}" - "${CD_PYTHON_COMMAND}" -m "${CD_NAME}" + "${CD_PYTHON_COMMAND}" -m "${CD_NAME}" "${CD_ENV}" } function cd_main { diff --git a/cd/__init__.py b/cd/__init__.py index 7dbddbd..0849737 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -1,28 +1,22 @@ import os -from cd.project import Project -from cd.projects import Projects from rwx import ps COMMANDS_PREFIX = 'cd-' -environment = sorted(os.environ.items()) -project = Project() -projects = Projects(environment) - def cd_clone_branch(): ps.run('git', 'clone', - '--branch', project.branch, + '--branch', os.environ['CD_PROJECT_BRANCH'], '--', - project.url, + os.environ['CD_PROJECT_URL'], '.', ) def cd_list_environment(): - for variable, value in environment: + for variable, value in sorted(os.environ.items()): print(variable, '=', value) diff --git a/cd/project.py b/cd/project.py deleted file mode 100644 index 8ee7c56..0000000 --- a/cd/project.py +++ /dev/null @@ -1,3 +0,0 @@ -class Project: - def __init__(self): - pass diff --git a/cd/projects.py b/cd/projects.py deleted file mode 100644 index 96f57bf..0000000 --- a/cd/projects.py +++ /dev/null @@ -1,3 +0,0 @@ -class Projects: - def __init__(self, environment): - self.env = environment