diff --git a/bootstrap.sh b/cd-bootstrap.sh similarity index 59% rename from bootstrap.sh rename to cd-bootstrap.sh index 366e2f4..dbab7b6 100755 --- a/bootstrap.sh +++ b/cd-bootstrap.sh @@ -1,7 +1,3 @@ -FILE="$(realpath "${BASH_SOURCE[0]}")" -NAME="$(basename "${GITHUB_REPOSITORY}")" -ROOT="$(dirname "${FILE}")" - KEY_ALGORITHM='ed25519' KEY_DIRECTORY='.ssh' KEY_PATH="${KEY_DIRECTORY}/id_${KEY_ALGORITHM}" @@ -12,15 +8,6 @@ PACKAGES=( 'tree' ) SERVER="$(basename ${GITHUB_SERVER_URL})" -TARGET='/usr/local/sbin' - -# commands -cd "${ROOT}/${NAME}" \ -|| exit -for file in *.sh ; do - cp "${file}" "${TARGET}" \ - || exit -done # ssh cd \ @@ -37,8 +24,4 @@ echo "${SERVER} ssh-${KEY_ALGORITHM} ${KEY_PUBLIC}" \ || exit # packages -apt-get install --yes "${PACKAGES[@]}" \ -|| exit - -# remove -rm --force --recursive "${ROOT}" +apt-get install --yes "${PACKAGES[@]}" diff --git a/cd/cd-browse-workspace.sh b/cd-browse-workspace similarity index 100% rename from cd/cd-browse-workspace.sh rename to cd-browse-workspace diff --git a/cd/cd-build-project.sh b/cd-build-project similarity index 100% rename from cd/cd-build-project.sh rename to cd-build-project diff --git a/cd/cd-clone-branch.sh b/cd-clone-branch similarity index 100% rename from cd/cd-clone-branch.sh rename to cd-clone-branch diff --git a/cd/cd-clone-python.sh b/cd-clone-python similarity index 100% rename from cd/cd-clone-python.sh rename to cd-clone-python diff --git a/cd/cd-install-packages.sh b/cd-install-packages similarity index 100% rename from cd/cd-install-packages.sh rename to cd-install-packages diff --git a/cd/cd-list-environment.sh b/cd-list-environment similarity index 100% rename from cd/cd-list-environment.sh rename to cd-list-environment diff --git a/cd/cd-synchronize.sh b/cd-synchronize similarity index 100% rename from cd/cd-synchronize.sh rename to cd-synchronize diff --git a/cd.sh b/cd.sh index f04df33..583d97d 100644 --- a/cd.sh +++ b/cd.sh @@ -5,6 +5,7 @@ PACKAGES=( 'git' ) REPOSITORY='rwx.work/cd' +TARGET='/usr/local/sbin' for nameserver in "${NAMESERVERS[@]}" ; do echo "nameserver ${nameserver}" \ @@ -18,10 +19,9 @@ apt-get update \ apt-get install --yes "${PACKAGES[@]}" \ || exit -DIRECTORY="$(mktemp --directory)" \ -|| exit git clone \ "${GITHUB_SERVER_URL}/${REPOSITORY}" \ -"${DIRECTORY}" \ +"${TARGET}" \ || exit -"${DIRECTORY}/bootstrap.sh" + +cd-bootstrap.sh