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