Browse Source

Hint shellcheck where to look for sourced files, if in repository

This will ease running shellcheck from the repository.
Marek Marczykowski-Górecki 6 years ago
parent
commit
aad6fa6d19

+ 1 - 0
init/control-printer-icon.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 if ! is_fully_persistent && test -f /etc/xdg/autostart/print-applet.desktop ; then

+ 2 - 0
misc/block-snapshot

@@ -6,9 +6,11 @@
 
 dir=$(dirname "$0")
 if [ "$1" = "prepare" ] || [ "$1" = "cleanup" ]; then
+  # shellcheck disable=SC1090,SC1091
   . "$dir/xen-hotplug-common.sh"
   command=$1
 else
+  # shellcheck disable=SC1090,SC1091
   . "$dir/block-common.sh"
 fi
 

+ 1 - 0
misc/qubes-trigger-sync-appmenus.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 if is_updateable ; then

+ 1 - 0
qubes-rpc/prepare-suspend

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 action=$1

+ 1 - 0
qubes-rpc/qubes-open

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 if [ -r /etc/profile.d/qubes-session.sh ]; then
+    # shellcheck disable=SC1091
     . /etc/profile.d/qubes-session.sh
 fi
 

+ 2 - 0
vm-init.d/qubes-core

@@ -4,9 +4,11 @@
 # description: Executes supplementary Qubes core scripts at VM boot
 #
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 start()

+ 2 - 0
vm-init.d/qubes-core-early

@@ -4,9 +4,11 @@
 # description: Executes early necessary Qubes core scripts at VM boot
 #
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 start()

+ 2 - 0
vm-init.d/qubes-core-netvm

@@ -4,9 +4,11 @@
 # description: Executes Qubes core scripts at NetVM boot
 #
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 start()

+ 2 - 0
vm-init.d/qubes-firewall

@@ -4,9 +4,11 @@
 # description: Starts Qubes Firewall monitor
 #
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 PIDFILE=/var/run/qubes/qubes-firewall.pid

+ 2 - 0
vm-init.d/qubes-qrexec-agent

@@ -4,9 +4,11 @@
 # description: Executes Qubes core scripts at VM boot
 #
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 start()

+ 1 - 0
vm-init.d/qubes-sysinit

@@ -5,6 +5,7 @@
 #
 
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 start()

+ 4 - 0
vm-init.d/qubes-updates-proxy

@@ -14,12 +14,15 @@
 # see PidFile in the configuration file.
 
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 # Source networking configuration.
+# shellcheck disable=SC1091
 .  /etc/sysconfig/network
 
 # Check that networking is up.
@@ -30,6 +33,7 @@ prog=$(basename $exec)
 config="/etc/tinyproxy/tinyproxy-updates.conf"
 pidfile="/var/run/tinyproxy-updates/tinyproxy.pid"
 
+# shellcheck disable=SC1091
 [ -e /etc/sysconfig/tinyproxy-updates ] && . /etc/sysconfig/tinyproxy-updates
 
 lockfile=/var/lock/subsys/tinyproxy-updates

+ 4 - 0
vm-init.d/qubes-updates-proxy-forwarder

@@ -10,12 +10,15 @@
 #
 
 # Source function library.
+# shellcheck disable=SC1091
 . /etc/rc.d/init.d/functions
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 # Source networking configuration.
+# shellcheck disable=SC1091
 .  /etc/sysconfig/network
 
 # Check that networking is up.
@@ -25,6 +28,7 @@ exec="/usr/bin/ncat"
 prog=$(basename $exec)
 pidfile="/var/run/qubes-updates-proxy-forwarder.pid"
 
+# shellcheck disable=SC1091
 [ -e /etc/sysconfig/qubes-updates-proxy-forwarder ] && . /etc/sysconfig/qubes-updates-proxy-forwarder
 
 lockfile=/var/lock/subsys/qubes-updates-proxy-forwarder

+ 1 - 0
vm-systemd/bind-dirs.sh

@@ -25,6 +25,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Source Qubes library.
+# shellcheck source=init/functions
 source /usr/lib/qubes/init/functions
 
 prerequisite() {

+ 1 - 0
vm-systemd/misc-post.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 /usr/lib/qubes/update-proxy-configs

+ 1 - 0
vm-systemd/mount-dirs.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 set -e

+ 1 - 0
vm-systemd/qubes-random-seed.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 set -e

+ 1 - 0
vm-systemd/qubes-sysinit.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Source Qubes library.
+# shellcheck source=init/functions
 . /usr/lib/qubes/init/functions
 
 # List of services enabled by default (in case of absence of qubesdb entry)