Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debian: fix shellcheck warnings in debian packaging

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-30 04:52:32 +02:00
parent 8bb152f76e
commit f16753c67b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian-quilt
View File

@ -22,7 +22,7 @@ fi
rm -f "${PATCH_DIR}/series" rm -f "${PATCH_DIR}/series"
touch "${PATCH_DIR}/series" touch "${PATCH_DIR}/series"
while read patch_file while read -r patch_file
do do
if [ -e "${DIR}/${patch_file}" ]; then if [ -e "${DIR}/${patch_file}" ]; then
echo -e "${patch_file##*/}" >> "${PATCH_DIR}/series" echo -e "${patch_file##*/}" >> "${PATCH_DIR}/series"

15
debian/qubes-core-agent.postinst vendored
View File

@ -22,7 +22,7 @@ set -e
debug() { debug() {
if [ "${DEBDEBUG}" == "1" ]; then if [ "${DEBDEBUG}" == "1" ]; then
echo -e ""$@"" echo -e "$@"
fi fi
} }
@ -34,11 +34,11 @@ systemdPreload() {
systemctl --no-reload preset-all > /dev/null 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1 systemctl --no-reload preset-all > /dev/null 2>&1 && PRESET_FAILED=0 || PRESET_FAILED=1
# Mask any static unit files that are marked to be disabled # Mask any static unit files that are marked to be disabled
grep '^[[:space:]]*[^#;]' /lib/systemd/system-preset/75-qubes-vm.preset | while read action unit_name; do grep '^[[:space:]]*[^#;]' /lib/systemd/system-preset/75-qubes-vm.preset | while read -r action unit_name; do
case "${action}" in case "${action}" in
disable) disable)
if [ -e "/lib/systemd/system/${unit_name}" ]; then if [ -e "/lib/systemd/system/${unit_name}" ]; then
if ! fgrep -q '[Install]' "/lib/systemd/system/${unit_name}"; then if ! grep -F -q '[Install]' "/lib/systemd/system/${unit_name}"; then
deb-systemd-helper mask "${unit_name}" > /dev/null 2>&1 || true deb-systemd-helper mask "${unit_name}" > /dev/null 2>&1 || true
fi fi
fi fi
@ -70,6 +70,7 @@ case "${1}" in
debug "FIRST INSTALL..." debug "FIRST INSTALL..."
# Location of files which contains list of protected files # Location of files which contains list of protected files
# shellcheck source=init/functions
. /usr/lib/qubes/init/functions . /usr/lib/qubes/init/functions
# ensure that hostname resolves to 127.0.1.1 resp. ::1 and that /etc/hosts is # ensure that hostname resolves to 127.0.1.1 resp. ::1 and that /etc/hosts is
@ -77,10 +78,10 @@ case "${1}" in
if ! is_protected_file /etc/hostname ; then if ! is_protected_file /etc/hostname ; then
for ip in '127\.0\.1\.1' '::1'; do for ip in '127\.0\.1\.1' '::1'; do
if grep -q "^${ip}\(\s\|$\)" /etc/hosts; then if grep -q "^${ip}\(\s\|$\)" /etc/hosts; then
sed -i "/^${ip}\s/,+0s/\(\s`hostname`\)\+\(\s\|$\)/\2/g" /etc/hosts || true sed -i "/^${ip}\s/,+0s/\(\s$(hostname)\)\+\(\s\|$\)/\2/g" /etc/hosts || true
sed -i "s/^${ip}\(\s\|$\).*$/\0 `hostname`/" /etc/hosts || true sed -i "s/^${ip}\(\s\|$\).*$/\0 $(hostname)/" /etc/hosts || true
else else
echo "${ip//\\/} `hostname`" >> /etc/hosts || true echo "${ip//\\/} $(hostname)" >> /etc/hosts || true
fi fi
done done
fi fi
@ -88,7 +89,7 @@ case "${1}" in
# remove hostname from 127.0.0.1 line (in debian the hostname is by default # remove hostname from 127.0.0.1 line (in debian the hostname is by default
# resolved to 127.0.1.1) # resolved to 127.0.1.1)
if ! is_protected_file /etc/hosts ; then if ! is_protected_file /etc/hosts ; then
sed -i "/^127\.0\.0\.1\s/,+0s/\(\s`hostname`\)\+\(\s\|$\)/\2/g" /etc/hosts || true sed -i "/^127\.0\.0\.1\s/,+0s/\(\s$(hostname)\)\+\(\s\|$\)/\2/g" /etc/hosts || true
fi fi
# Set default "runlevel" # Set default "runlevel"