From 586b73697426e373502dce18fc0957a28299f962 Mon Sep 17 00:00:00 2001 From: southerntofu Date: Mon, 27 Apr 2020 17:58:17 +0200 Subject: [PATCH] Move things in subfolders --- forgehook-run-backend => backends/git-build | 0 forgehook => bin/forgehook | 0 forgehook-backend => bin/forgehook-backend | 0 forgehook-run => bin/forgehook-run | 0 setup.sh | 11 +++++++---- 5 files changed, 7 insertions(+), 4 deletions(-) rename forgehook-run-backend => backends/git-build (100%) rename forgehook => bin/forgehook (100%) rename forgehook-backend => bin/forgehook-backend (100%) rename forgehook-run => bin/forgehook-run (100%) diff --git a/forgehook-run-backend b/backends/git-build similarity index 100% rename from forgehook-run-backend rename to backends/git-build diff --git a/forgehook b/bin/forgehook similarity index 100% rename from forgehook rename to bin/forgehook diff --git a/forgehook-backend b/bin/forgehook-backend similarity index 100% rename from forgehook-backend rename to bin/forgehook-backend diff --git a/forgehook-run b/bin/forgehook-run similarity index 100% rename from forgehook-run rename to bin/forgehook-run diff --git a/setup.sh b/setup.sh index 40e9c46..4ddd9f9 100755 --- a/setup.sh +++ b/setup.sh @@ -4,6 +4,9 @@ DEST="/usr/local/bin" +# TODO: Make default backend configurable +BACKEND=./backends/git-build + # Autodetect forgehook user if it's already setup owner=$(find /usr/local/bin/forgehook-backend -maxdepth 0 -printf '%u') if [[ $? = 0 ]]; then @@ -40,21 +43,21 @@ fi # TODO: Check we can escalade privileges # Everyone can execute (user-facing wrapper) -sudo cp forgehook $DEST +sudo cp bin/forgehook $DEST sudo chown "$owner:$owner" $DEST/forgehook # Only $owner can execute -sudo cp forgehook-backend $DEST +sudo cp bin/forgehook-backend $DEST sudo chown "$owner:$owner" $DEST/forgehook-backend sudo chmod 744 $DEST/forgehook-backend # Only root should execute -sudo cp forgehook-run $DEST +sudo cp bin/forgehook-run $DEST sudo chown "$owner:$owner" $DEST/forgehook-run sudo chmod 744 $DEST/forgehook-run # Everyone can execute (wrapper script for build manager such as git-build) -sudo cp forgehook-run-backend $DEST +sudo cp $BACKEND $DEST sudo chown "$owner:$owner" $DEST/forgehook-run-backend sudo chmod 755 $DEST/forgehook-run-backend