mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
Add bash -c to shell calls with su
This commit is contained in:
parent
f7425a0a00
commit
0c2678642d
2 changed files with 11 additions and 11 deletions
|
@ -95,11 +95,11 @@ _upload_efi_files() {
|
||||||
for i in *.efi; do
|
for i in *.efi; do
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if [[ -f "${i}" ]]; then
|
if [[ -f "${i}" ]]; then
|
||||||
su -m "${_USER}" -c gpg ${_GPG} "${i}" || exit 1
|
su -m "${_USER}" -c bash -c "gpg ${_GPG} "${i}" || exit 1"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
su -m "${_USER}" -c ${_RSYNC} ./* "${_SERVER}:.${_ARCH_SERVERDIR}/" || exit 1
|
su -m "${_USER}" -c bash -c "${_RSYNC} ./* "${_SERVER}:.${_ARCH_SERVERDIR}/" || exit 1"
|
||||||
cd ..
|
cd ..
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ _update_pacman_chroot() {
|
||||||
${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}".sig
|
${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}".sig
|
||||||
# verify download
|
# verify download
|
||||||
#shellcheck disable=SC2024
|
#shellcheck disable=SC2024
|
||||||
su -m "${_USER}" -c gpg --verify "${_PACMAN_CHROOT}.sig" &>"${_NO_LOG}" || exit 1
|
su -m "${_USER}" -c bash -c "gpg --verify "${_PACMAN_CHROOT}.sig" &>"${_NO_LOG}" || exit 1"
|
||||||
bsdtar -C "${_ARCH_DIR}" -xf "${_PACMAN_CHROOT}" &>"${_NO_LOG}"
|
bsdtar -C "${_ARCH_DIR}" -xf "${_PACMAN_CHROOT}" &>"${_NO_LOG}"
|
||||||
echo "Removing installation tarball..."
|
echo "Removing installation tarball..."
|
||||||
rm "${_PACMAN_CHROOT}"{,.sig} &>"${_NO_LOG}"
|
rm "${_PACMAN_CHROOT}"{,.sig} &>"${_NO_LOG}"
|
||||||
|
@ -46,31 +46,31 @@ _update_pacman_chroot() {
|
||||||
echo "Finished container tarball."
|
echo "Finished container tarball."
|
||||||
echo "Sign tarball..."
|
echo "Sign tarball..."
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
su -m "${_USER}" -c gpg ${_GPG} "${_PACMAN_CHROOT}" || exit 1
|
su -m "${_USER}" -c bash -c "gpg ${_GPG} "${_PACMAN_CHROOT}" || exit 1"
|
||||||
chown "${_USER}:${_GROUP}" "${_PACMAN_CHROOT}"{,.sig} || exit 1
|
chown "${_USER}:${_GROUP}" "${_PACMAN_CHROOT}"{,.sig} || exit 1
|
||||||
echo "Syncing files to ${_SERVER}:${_PUB}/.${_SERVER_PACMAN}..."
|
echo "Syncing files to ${_SERVER}:${_PUB}/.${_SERVER_PACMAN}..."
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
su -m "${_USER}" -c ${_RSYNC} "${_PACMAN_CHROOT}"{,.sig} "${_SERVER}:${_PUB}/.${_SERVER_PACMAN}/" || exit 1
|
su -m "${_USER}" -c bash -c "${_RSYNC} "${_PACMAN_CHROOT}"{,.sig} "${_SERVER}:${_PUB}/.${_SERVER_PACMAN}/" || exit 1"
|
||||||
}
|
}
|
||||||
|
|
||||||
_server_upload() {
|
_server_upload() {
|
||||||
# copy files to server
|
# copy files to server
|
||||||
echo "Syncing files to ${_SERVER}:${_PUB}/.${1}/${_ARCH}..."
|
echo "Syncing files to ${_SERVER}:${_PUB}/.${1}/${_ARCH}..."
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
su -m "${_USER}" -c ssh "${_SERVER}" [[ -d "${_PUB}/.${1}/${_ARCH}" ]] || mkdir -p "${_PUB}/.${1}/${_ARCH}"
|
su -m "${_USER}" -c bash -c "ssh "${_SERVER}" [[ -d "${_PUB}/.${1}/${_ARCH}" ]] || mkdir -p "${_PUB}/.${1}/${_ARCH}""
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
su -m "${_USER}" -c ${_RSYNC} "${_DIR}" "${_SERVER}":"${_PUB}/.${1}/${_ARCH}/" || exit 1
|
su -m "${_USER}" -c bash -c "${_RSYNC} "${_DIR}" "${_SERVER}":"${_PUB}/.${1}/${_ARCH}/" || exit 1"
|
||||||
# move files on server, create symlink and removing ${_PURGE_DATE} old release
|
# move files on server, create symlink and removing ${_PURGE_DATE} old release
|
||||||
su -m "${_USER}" -c ssh "${_SERVER}" <<EOF
|
su -m "${_USER}" -c bash -c "ssh "${_SERVER}" <<EOF
|
||||||
echo "Removing old purge date reached ${_PUB}/.${1}/${_ARCH}/$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m) directory..."
|
echo "Removing old purge date reached ${_PUB}/.${1}/${_ARCH}/$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m) directory..."
|
||||||
rm -r ${_PUB}/".${1}"/"${_ARCH}"/"$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m)" 2>"${_NO_LOG}"
|
rm -r ${_PUB}/".${1}"/"${_ARCH}"/"$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m)" 2>"${_NO_LOG}"
|
||||||
cd ${_PUB}/".${1}"/"${_ARCH}"
|
cd ${_PUB}/".${1}"/"${_ARCH}"
|
||||||
echo "Creating new latest symlink in ${_PUB}/.${1}/${_ARCH}..."
|
echo "Creating new latest symlink in ${_PUB}/.${1}/${_ARCH}..."
|
||||||
rm latest
|
rm latest
|
||||||
ln -s "${_DIR}" latest
|
ln -s "${_DIR}" latest
|
||||||
EOF
|
EOF"
|
||||||
# create autoindex HEADER.html
|
# create autoindex HEADER.html
|
||||||
su -m "${_USER}" -c ssh "${_SERVER}" "[[ -e ~/lsws-autoindex.sh ]] && ~/./lsws-autoindex.sh"
|
su -m "${_USER}" -c bash -c "ssh "${_SERVER}" "[[ -e ~/lsws-autoindex.sh ]] && ~/./lsws-autoindex.sh""
|
||||||
}
|
}
|
||||||
|
|
||||||
_create_archive() {
|
_create_archive() {
|
||||||
|
@ -84,7 +84,7 @@ _sign_b2sum() {
|
||||||
for i in $1; do
|
for i in $1; do
|
||||||
#shellcheck disable=SC2086
|
#shellcheck disable=SC2086
|
||||||
if [[ -f "${i}" ]]; then
|
if [[ -f "${i}" ]]; then
|
||||||
su -m "${_USER}" -c gpg ${_GPG} "${i}"
|
su -m "${_USER}" -c bash -c "gpg ${_GPG} "${i}""
|
||||||
cksum -a blake2b "${i}" >> b2sum.txt
|
cksum -a blake2b "${i}" >> b2sum.txt
|
||||||
fi
|
fi
|
||||||
if [[ -f "${i}.sig" ]]; then
|
if [[ -f "${i}.sig" ]]; then
|
||||||
|
|
Loading…
Reference in a new issue