mirror of
https://github.com/dehydrated-io/dehydrated.git
synced 2026-07-01 18:51:44 +02:00
fix spaces in sudo arguments
This commit is contained in:
+3
-3
@@ -29,7 +29,7 @@ done
|
|||||||
SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
|
||||||
|
|
||||||
BASEDIR="${SCRIPTDIR}"
|
BASEDIR="${SCRIPTDIR}"
|
||||||
ORIGARGS="$@"
|
ORIGARGS=("${@}")
|
||||||
|
|
||||||
# Generate json.sh path matching string
|
# Generate json.sh path matching string
|
||||||
json_path() {
|
json_path() {
|
||||||
@@ -410,7 +410,7 @@ load_config() {
|
|||||||
if [[ -z "${DEHYDRATED_GROUP}" ]]; then
|
if [[ -z "${DEHYDRATED_GROUP}" ]]; then
|
||||||
if [[ "${EUID}" != "${TARGET_UID}" ]]; then
|
if [[ "${EUID}" != "${TARGET_UID}" ]]; then
|
||||||
echo "# INFO: Running $0 as ${DEHYDRATED_USER}"
|
echo "# INFO: Running $0 as ${DEHYDRATED_USER}"
|
||||||
has_sudo && exec sudo -u "${DEHYDRATED_USER}" "${0}" ${ORIGARGS}
|
has_sudo && exec sudo -u "${DEHYDRATED_USER}" "${0}" "${ORIGARGS[@]}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
TARGET_GID="$(getent group "${DEHYDRATED_GROUP}" | cut -d':' -f3)" || _exiterr "DEHYDRATED_GROUP ${DEHYDRATED_GROUP} is invalid"
|
TARGET_GID="$(getent group "${DEHYDRATED_GROUP}" | cut -d':' -f3)" || _exiterr "DEHYDRATED_GROUP ${DEHYDRATED_GROUP} is invalid"
|
||||||
@@ -420,7 +420,7 @@ load_config() {
|
|||||||
fi
|
fi
|
||||||
if [[ "${EUID}" != "${TARGET_UID}" ]] || [[ "${EGID}" != "${TARGET_GID}" ]]; then
|
if [[ "${EUID}" != "${TARGET_UID}" ]] || [[ "${EGID}" != "${TARGET_GID}" ]]; then
|
||||||
echo "# INFO: Running $0 as ${DEHYDRATED_USER}/${DEHYDRATED_GROUP}"
|
echo "# INFO: Running $0 as ${DEHYDRATED_USER}/${DEHYDRATED_GROUP}"
|
||||||
has_sudo && exec sudo -u "${DEHYDRATED_USER}" -g "${DEHYDRATED_GROUP}" "${0}" ${ORIGARGS}
|
has_sudo && exec sudo -u "${DEHYDRATED_USER}" -g "${DEHYDRATED_GROUP}" "${0}" "${ORIGARGS[@]}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
elif [[ -n "${DEHYDRATED_GROUP}" ]]; then
|
elif [[ -n "${DEHYDRATED_GROUP}" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user