From e3b97ae8d46a4cf4ccaa80b0549216d0160332a1 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 4 Jul 2025 13:06:50 +0900 Subject: [PATCH] Fix script copy file names and set owner correctly --- src/bin/base_setup.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/bin/base_setup.sh b/src/bin/base_setup.sh index b6aaf2d..5c98566 100755 --- a/src/bin/base_setup.sh +++ b/src/bin/base_setup.sh @@ -81,7 +81,7 @@ else echo "+ Set folder user/group"; # user is not mandatory, but we need to set the group setfacl -m u:"${SUDO_USER}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}" - setfacl -m -d u:"${SUDO_USER}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}" + setfacl -d -m u:"${SUDO_USER}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}" setfacl -m g:"${WWW_GROUP}":rx -R "${GIT_WEBHOOK_BASE_FOLDER}" # SSH if [ "${USE_SUDO}" != "0" ]; then @@ -131,8 +131,14 @@ EOF # Copy files echo "+ Copy basic script and config files"; # git_pull.sh, init.sh, new_clone.sh, webhook.default.cfg - sudo -u "${SUDO_USER}" cp "${BASE_FOLDER}new_clone.sh" "${BASE_FOLDER}init.sh" "${BASE_FOLDER}git_clone.sh" "${GIT_WEBHOOK_BASE_FOLDER}${SCRIPT_FOLDER}"; - sudo -u "${SUDO_USER}" cp "${CONFIG_BASE}/webhook.default.cfg" "${GIT_WEBHOOK_BASE_FOLDER}${CONFIG_FOLDER}"; + cp "${BASE_FOLDER}new_clone.sh" "${BASE_FOLDER}init.sh" "${BASE_FOLDER}git_pull.sh" "${GIT_WEBHOOK_BASE_FOLDER}${SCRIPT_FOLDER}"; + cp "${CONFIG_BASE}/webhook.default.cfg" "${GIT_WEBHOOK_BASE_FOLDER}${CONFIG_FOLDER}"; + # and make sure they are all owned by the correct user + chown "${SUDO_USER}" \ + "${BASE_FOLDER}new_clone.sh" \ + "${BASE_FOLDER}init.sh" \ + "${BASE_FOLDER}git_pull.sh" \ + "${CONFIG_BASE}/webhook.default.cfg"; fi; # __END__