From f2bfa76ec56e7f912a34666e75a9bb11a74dc090 Mon Sep 17 00:00:00 2001
From: a1346054 <36859588+a1346054@users.noreply.github.com>
Date: Tue, 24 Aug 2021 09:32:21 +0000
Subject: [PATCH 1/2] Fix spelling

---
 .github/ISSUE_TEMPLATE/issue-report.md | 2 +-
 compat/fuse_opt.h                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/issue-report.md b/.github/ISSUE_TEMPLATE/issue-report.md
index 46577bf6..65893f40 100644
--- a/.github/ISSUE_TEMPLATE/issue-report.md
+++ b/.github/ISSUE_TEMPLATE/issue-report.md
@@ -11,7 +11,7 @@ PLEASE READ BEFORE REPORTING AN ISSUE
 
 SSHFS does not have any active, regular contributors or developers. The current maintainer continues to apply pull requests and tries to make regular releases, but unfortunately has no capacity to do any development beyond addressing high-impact issues. When reporting bugs, please understand that unless you are including a pull request or are reporting a critical issue, you will probably not get a response.
 
-To prevent the issue tracker from being flooded with issues that no-one is intending to work on, and to give more visibilty to critical issues that users should be aware of and that most urgently need attention, I will also close most bug reports once they've been inactive for a while.
+To prevent the issue tracker from being flooded with issues that no-one is intending to work on, and to give more visibility to critical issues that users should be aware of and that most urgently need attention, I will also close most bug reports once they've been inactive for a while.
 
 Please note that this isn't meant to imply that you haven't found a bug - you most likely have and I'm grateful that you took the time to report it. Unfortunately, SSHFS is a purely volunteer driven project,
 and at the moment there simply aren't any volunteers.
diff --git a/compat/fuse_opt.h b/compat/fuse_opt.h
index 9e159d5a..de38451b 100644
--- a/compat/fuse_opt.h
+++ b/compat/fuse_opt.h
@@ -18,7 +18,7 @@ extern "C" {
 /**
  * Option description
  *
- * This structure describes a single option, and and action associated
+ * This structure describes a single option, and an action associated
  * with it, in case it matches.
  *
  * More than one such match may occur, in which case the action for

From 1059e89b4602b6f91cbf96c86cf24d4eadcde701 Mon Sep 17 00:00:00 2001
From: a1346054 <36859588+a1346054@users.noreply.github.com>
Date: Tue, 24 Aug 2021 12:01:37 +0000
Subject: [PATCH 2/2] Fix shellcheck-identified warnings in shell scripts

---
 test/appveyor-build.sh | 4 ++--
 test/travis-build.sh   | 8 ++++----
 test/travis-install.sh | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/appveyor-build.sh b/test/appveyor-build.sh
index 31be8bb2..dcf78002 100755
--- a/test/appveyor-build.sh
+++ b/test/appveyor-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 machine=$(uname -m)
-mkdir build-$machine
-cd build-$machine
+mkdir "build-$machine"
+cd "build-$machine"
 meson ..
 ninja
diff --git a/test/travis-build.sh b/test/travis-build.sh
index bed71ee8..c33f7dc1 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -13,8 +13,8 @@ TEST_CMD="python3 -m pytest --maxfail=99 test/"
 
 # Standard build with Valgrind
 for CC in gcc clang; do
-    mkdir build-${CC}; cd build-${CC}
-    if [ ${CC} == 'gcc-6' ]; then
+    mkdir "build-${CC}"; cd "build-${CC}"
+    if [ "${CC}" == 'gcc-6' ]; then
         build_opts='-D b_lundef=false'
     else
         build_opts=''
@@ -25,12 +25,12 @@ for CC in gcc clang; do
     TEST_WITH_VALGRIND=true ${TEST_CMD}
     cd ..
 done
-(cd build-$CC; sudo ninja install)
+(cd "build-${CC}"; sudo ninja install)
 
 # Sanitized build
 CC=clang
 for san in undefined address; do
-    mkdir build-${san}; cd build-${san}
+    mkdir "build-${san}"; cd "build-${san}"
     # b_lundef=false is required to work around clang
     # bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
     meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
diff --git a/test/travis-install.sh b/test/travis-install.sh
index a6d9d26e..c2df8210 100755
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -13,7 +13,7 @@ ninja
 sudo ninja install
 test -e /usr/local/lib/pkgconfig || sudo mkdir /usr/local/lib/pkgconfig
 sudo mv /usr/local/lib/*/pkgconfig/* /usr/local/lib/pkgconfig/
-ls -d1 /usr/local/lib/*-linux-gnu | sudo tee /etc/ld.so.conf.d/usrlocal.conf
+printf '%s\n' /usr/local/lib/*-linux-gnu | sudo tee /etc/ld.so.conf.d/usrlocal.conf
 sudo ldconfig
 
 # Setup ssh