From e1607151ee1d7b20bfca5bc9d8284f2ce93d31b2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 19:59:12 +0100 Subject: [PATCH 1/8] commands --- cd-bootstrap.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cd-bootstrap.sh b/cd-bootstrap.sh index dbab7b6..310546c 100755 --- a/cd-bootstrap.sh +++ b/cd-bootstrap.sh @@ -1,3 +1,7 @@ +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}" @@ -8,6 +12,15 @@ 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 \ From 689079190991a968be0123f867e74a7546a0f6cd Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:01:32 +0100 Subject: [PATCH 2/8] mv --- cd-browse-workspace => cd/cd-browse-workspace | 0 cd-build-project => cd/cd-build-project | 0 cd-clone-branch => cd/cd-clone-branch | 0 cd-clone-python => cd/cd-clone-python | 0 cd-install-packages => cd/cd-install-packages | 0 cd-list-environment => cd/cd-list-environment | 0 cd-synchronize => cd/cd-synchronize | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename cd-browse-workspace => cd/cd-browse-workspace (100%) rename cd-build-project => cd/cd-build-project (100%) rename cd-clone-branch => cd/cd-clone-branch (100%) rename cd-clone-python => cd/cd-clone-python (100%) rename cd-install-packages => cd/cd-install-packages (100%) rename cd-list-environment => cd/cd-list-environment (100%) rename cd-synchronize => cd/cd-synchronize (100%) diff --git a/cd-browse-workspace b/cd/cd-browse-workspace similarity index 100% rename from cd-browse-workspace rename to cd/cd-browse-workspace diff --git a/cd-build-project b/cd/cd-build-project similarity index 100% rename from cd-build-project rename to cd/cd-build-project diff --git a/cd-clone-branch b/cd/cd-clone-branch similarity index 100% rename from cd-clone-branch rename to cd/cd-clone-branch diff --git a/cd-clone-python b/cd/cd-clone-python similarity index 100% rename from cd-clone-python rename to cd/cd-clone-python diff --git a/cd-install-packages b/cd/cd-install-packages similarity index 100% rename from cd-install-packages rename to cd/cd-install-packages diff --git a/cd-list-environment b/cd/cd-list-environment similarity index 100% rename from cd-list-environment rename to cd/cd-list-environment diff --git a/cd-synchronize b/cd/cd-synchronize similarity index 100% rename from cd-synchronize rename to cd/cd-synchronize From 7248db6bca6f806eb22f18c773521d36c0504590 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:03:02 +0100 Subject: [PATCH 3/8] remove --- cd-bootstrap.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cd-bootstrap.sh b/cd-bootstrap.sh index 310546c..366e2f4 100755 --- a/cd-bootstrap.sh +++ b/cd-bootstrap.sh @@ -37,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}" From ee1357194ba6d816c15bb656a1847bf3e824e544 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:04:31 +0100 Subject: [PATCH 4/8] .sh --- cd/{cd-browse-workspace => cd-browse-workspace.sh} | 0 cd/{cd-build-project => cd-build-project.sh} | 0 cd/{cd-clone-branch => cd-clone-branch.sh} | 0 cd/{cd-clone-python => cd-clone-python.sh} | 0 cd/{cd-install-packages => cd-install-packages.sh} | 0 cd/{cd-list-environment => cd-list-environment.sh} | 0 cd/{cd-synchronize => cd-synchronize.sh} | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename cd/{cd-browse-workspace => cd-browse-workspace.sh} (100%) rename cd/{cd-build-project => cd-build-project.sh} (100%) rename cd/{cd-clone-branch => cd-clone-branch.sh} (100%) rename cd/{cd-clone-python => cd-clone-python.sh} (100%) rename cd/{cd-install-packages => cd-install-packages.sh} (100%) rename cd/{cd-list-environment => cd-list-environment.sh} (100%) rename cd/{cd-synchronize => cd-synchronize.sh} (100%) diff --git a/cd/cd-browse-workspace b/cd/cd-browse-workspace.sh similarity index 100% rename from cd/cd-browse-workspace rename to cd/cd-browse-workspace.sh diff --git a/cd/cd-build-project b/cd/cd-build-project.sh similarity index 100% rename from cd/cd-build-project rename to cd/cd-build-project.sh diff --git a/cd/cd-clone-branch b/cd/cd-clone-branch.sh similarity index 100% rename from cd/cd-clone-branch rename to cd/cd-clone-branch.sh diff --git a/cd/cd-clone-python b/cd/cd-clone-python.sh similarity index 100% rename from cd/cd-clone-python rename to cd/cd-clone-python.sh diff --git a/cd/cd-install-packages b/cd/cd-install-packages.sh similarity index 100% rename from cd/cd-install-packages rename to cd/cd-install-packages.sh diff --git a/cd/cd-list-environment b/cd/cd-list-environment.sh similarity index 100% rename from cd/cd-list-environment rename to cd/cd-list-environment.sh diff --git a/cd/cd-synchronize b/cd/cd-synchronize.sh similarity index 100% rename from cd/cd-synchronize rename to cd/cd-synchronize.sh From c1aad03c68d9527bc3ca3622ec3b695132c237fc Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:09:04 +0100 Subject: [PATCH 5/8] bootstrap --- cd-bootstrap.sh => bootstrap.sh | 0 cd.sh | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename cd-bootstrap.sh => bootstrap.sh (100%) diff --git a/cd-bootstrap.sh b/bootstrap.sh similarity index 100% rename from cd-bootstrap.sh rename to bootstrap.sh 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" From 71cd5178407ab07ddc690a7157e6d94adafcf4a3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:49:12 +0100 Subject: [PATCH 6/8] cmd --- bootstrap.sh | 4 ++-- {cd => cmd}/cd-browse-workspace.sh | 0 {cd => cmd}/cd-build-project.sh | 0 {cd => cmd}/cd-clone-branch.sh | 0 {cd => cmd}/cd-clone-python.sh | 0 {cd => cmd}/cd-install-packages.sh | 0 {cd => cmd}/cd-list-environment.sh | 0 {cd => cmd}/cd-synchronize.sh | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename {cd => cmd}/cd-browse-workspace.sh (100%) rename {cd => cmd}/cd-build-project.sh (100%) rename {cd => cmd}/cd-clone-branch.sh (100%) rename {cd => cmd}/cd-clone-python.sh (100%) rename {cd => cmd}/cd-install-packages.sh (100%) rename {cd => cmd}/cd-list-environment.sh (100%) rename {cd => cmd}/cd-synchronize.sh (100%) diff --git a/bootstrap.sh b/bootstrap.sh index 366e2f4..8ca4573 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,7 +1,7 @@ FILE="$(realpath "${BASH_SOURCE[0]}")" -NAME="$(basename "${GITHUB_REPOSITORY}")" ROOT="$(dirname "${FILE}")" +COMMANDS='cmd' KEY_ALGORITHM='ed25519' KEY_DIRECTORY='.ssh' KEY_PATH="${KEY_DIRECTORY}/id_${KEY_ALGORITHM}" @@ -15,7 +15,7 @@ SERVER="$(basename ${GITHUB_SERVER_URL})" TARGET='/usr/local/sbin' # commands -cd "${ROOT}/${NAME}" \ +cd "${ROOT}/${COMMANDS}" \ || exit for file in *.sh ; do cp "${file}" "${TARGET}" \ diff --git a/cd/cd-browse-workspace.sh b/cmd/cd-browse-workspace.sh similarity index 100% rename from cd/cd-browse-workspace.sh rename to cmd/cd-browse-workspace.sh diff --git a/cd/cd-build-project.sh b/cmd/cd-build-project.sh similarity index 100% rename from cd/cd-build-project.sh rename to cmd/cd-build-project.sh diff --git a/cd/cd-clone-branch.sh b/cmd/cd-clone-branch.sh similarity index 100% rename from cd/cd-clone-branch.sh rename to cmd/cd-clone-branch.sh diff --git a/cd/cd-clone-python.sh b/cmd/cd-clone-python.sh similarity index 100% rename from cd/cd-clone-python.sh rename to cmd/cd-clone-python.sh diff --git a/cd/cd-install-packages.sh b/cmd/cd-install-packages.sh similarity index 100% rename from cd/cd-install-packages.sh rename to cmd/cd-install-packages.sh diff --git a/cd/cd-list-environment.sh b/cmd/cd-list-environment.sh similarity index 100% rename from cd/cd-list-environment.sh rename to cmd/cd-list-environment.sh diff --git a/cd/cd-synchronize.sh b/cmd/cd-synchronize.sh similarity index 100% rename from cd/cd-synchronize.sh rename to cmd/cd-synchronize.sh From ad00afc4cce37e59939b37cee7e8f2049edc3694 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:52:27 +0100 Subject: [PATCH 7/8] .sh --- bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 8ca4573..054d967 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -18,7 +18,7 @@ TARGET='/usr/local/sbin' cd "${ROOT}/${COMMANDS}" \ || exit for file in *.sh ; do - cp "${file}" "${TARGET}" \ + cp "${file}" "${TARGET}/${file%.sh}" \ || exit done From 10280bcdd9256b27020e9cfb6076eedd32a087c9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 25 Mar 2024 20:58:03 +0100 Subject: [PATCH 8/8] useless --- cmd/cd-list-environment.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/cd-list-environment.sh b/cmd/cd-list-environment.sh index e22987a..dd3fd37 100755 --- a/cmd/cd-list-environment.sh +++ b/cmd/cd-list-environment.sh @@ -1,2 +1 @@ -unset TOP_SECRET env | sort