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

Fix the previous shellcheck-related "fixes" again

Browse Source 
(cherry picked from commit 8c06c1eabd8f36d307f5956b5fea8d3bbcbb317f)
This commit is contained in:
Nedyalko Andreev 2017-10-02 14:49:40 +03:00 committed by Marek Marczykowski-Górecki
parent 42676bafb8
commit c71609df19
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archlinux/PKGBUILD
View File

@ -56,14 +56,14 @@ build() {
sed 's:/usr/sbin/qubes-firewall:/usr/bin/qubes-firewall:g' -i vm-systemd/qubes-firewall.service sed 's:/usr/sbin/qubes-firewall:/usr/bin/qubes-firewall:g' -i vm-systemd/qubes-firewall.service
for dir in qubes-rpc qrexec misc; do for dir in qubes-rpc qrexec misc; do
(cd $dir || exit 1; make) make -C "$dir"
done done
} }
package() { package() {
# Note: Archlinux removed use of directory such as /sbin /bin /usr/sbin (https://mailman.archlinux.org/pipermail/arch-dev-public/2012-March/022625.html) # Note: Archlinux removed use of directory such as /sbin /bin /usr/sbin (https://mailman.archlinux.org/pipermail/arch-dev-public/2012-March/022625.html)
# shellcheck disable=SC2154 # shellcheck disable=SC2154
(cd qrexec || exit 1; make install DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib) make -C qrexec install DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
make install-vm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux make install-vm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux

4
archlinux/PKGBUILD.install
View File

@ -102,7 +102,7 @@ update_qubesconfig() {
# Location of files which contains list of protected files # Location of files which contains list of protected files
mkdir -p /etc/qubes/protected-files.d mkdir -p /etc/qubes/protected-files.d
# shellcheck source=../init/functions # shellcheck source=init/functions
. /usr/lib/qubes/init/functions . /usr/lib/qubes/init/functions
# qubes-core-vm has been broken for some time - it overrides /etc/hosts; restore original content # qubes-core-vm has been broken for some time - it overrides /etc/hosts; restore original content
@ -215,7 +215,7 @@ preset_units() {
} }
restore_units() { restore_units() {
while read -r action unit_name < grep '^[[:space:]]*[^#;]' "$1" grep '^[[:space:]]*[^#;]' "$1" | while read -r action unit_name
do do
if is_static "$unit_name" && is_masked "$unit_name" if is_static "$unit_name" && is_masked "$unit_name"
then then