Merge remote-tracking branch 'qubesos/pr/43'

* qubesos/pr/43:
  Fix more shellcheck warnings
  Fix handling of binds containing spaces

vm-systemd/bind-dirs.sh

@@ -25,7 +25,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Source Qubes library.
-. /usr/lib/qubes/init/functions
+source /usr/lib/qubes/init/functions
 
 prerequisite() {
    if ! is_rwonly_persistent ; then
@@ -55,7 +55,7 @@ bind_dirs() {
    ## ro: read-only
    ## rw: read-write
 
-   for fso_ro in ${binds[@]}; do
+   for fso_ro in "${binds[@]}"; do
       local symlink_level_counter
       symlink_level_counter="0"
 
@@ -117,6 +117,7 @@ main() {
    bind_dirs "$@"
 }
 
+binds=()
 for source_folder in /usr/lib/qubes-bind-dirs.d /etc/qubes-bind-dirs.d /rw/config/qubes-bind-dirs.d ; do
    true "source_folder: $source_folder"
    if [ ! -d "$source_folder" ]; then
@@ -124,6 +125,7 @@ for source_folder in /usr/lib/qubes-bind-dirs.d /etc/qubes-bind-dirs.d /rw/confi
    fi
    for file_name in "$source_folder/"*".conf" ; do
       bash -n "$file_name"
+      # shellcheck source=/dev/null
       source "$file_name"
    done
 done