diff --git a/ci/winnie/build_pgrouting.sh b/ci/winnie/build_pgrouting.sh
index f6ebd28e5dc..b9c3c770ad5 100644
--- a/ci/winnie/build_pgrouting.sh
+++ b/ci/winnie/build_pgrouting.sh
@@ -188,9 +188,9 @@ ls "${PGPATHEDB}"/share/extension/pgrouting*
 
 #we need uninstall and reinstall copy to VC++ EDB instance if we want to test on standard Windows installed versions
 #cp *.dll ${PGPATHEDB}/lib/  #TODO remove this once we fix so the .dlls are created in lib folder
-cp -r ${PGPATH}/lib/libpgrouting*.dll ${PGPATHEDB}/lib/
-cp -r ${PGPATH}/share/extension/pgrouting*.sql ${PGPATHEDB}/share/extension/
-cp -r ${PGPATH}/share/extension/pgrouting.control ${PGPATHEDB}/share/extension/
+cp -r "${PGPATH}/lib/libpgrouting*.dll" "${PGPATHEDB}/lib/"
+cp -r "${PGPATH}/share/extension/pgrouting*.sql" "${PGPATHEDB}/share/extension/"
+cp -r "${PGPATH}/share/extension/pgrouting.control" "${PGPATHEDB}/share/extension/"
 
 #---------------
 echo
@@ -198,8 +198,8 @@ echo "***************************"
 echo "After copying to PGPATHEDB ${PGPATHEDB}"
 echo "***************************"
 #---------------
-ls ${PGPATHEDB}/lib/libpgrouting*
-ls ${PGPATHEDB}/share/extension/pgrouting*
+ls "${PGPATHEDB}/lib/libpgrouting*"
+ls "${PGPATHEDB}/share/extension/pgrouting*"
 
 cd "${PROJECTS}/pgrouting/branches/${PGROUTING_VER}" || exit 1
 
diff --git a/tools/developer/addNewVersionLink.sh b/tools/developer/addNewVersionLink.sh
index 302df669ff4..3d8ae38e6ab 100755
--- a/tools/developer/addNewVersionLink.sh
+++ b/tools/developer/addNewVersionLink.sh
@@ -8,4 +8,4 @@ if [ -z "${NEWVER}" ] ; then echo 'USE: tools/developer/addNewVersionLink.sh "3\
 
 OLDSTR='^  \(`'"${OLDVER}"' (.*)\/'"${OLDVER}"'(.*)\)$'
 NEWSTR='  \(`'"${NEWVER}"' $1\/'"${NEWVER}"'$2\)\n  `'"${OLDVER}"' $1\/'"${OLDVER}"'$2'
-perl -pi -e 's/'"$OLDSTR"'/'"${NEWSTR}"'/' $(git ls-files | grep '\.rst')
+perl -pi -e 's/'"$OLDSTR"'/'"${NEWSTR}"'/' $(git ls-files './*.rst')
diff --git a/tools/developer/pumpup-dev.sh b/tools/developer/pumpup-dev.sh
index 055f0d9fbe3..a4521432c74 100644
--- a/tools/developer/pumpup-dev.sh
+++ b/tools/developer/pumpup-dev.sh
@@ -17,18 +17,18 @@ MICRO="$3"
 KIND="$4"
 OLD_VERSION="$5"
 VERSION="${MAYOR}.${MINOR}.${MICRO}"
-U_VERSION=$(echo "${VERSION//./_}")
-U_OLD_VERSION=$(echo "${OLD_VERSION//./_}")
+U_VERSION="${VERSION//./_}"
+U_OLD_VERSION="${OLD_VERSION//./_}"
 
 # --------------------------------------------
 # Modifications to CMakeLists
 # --------------------------------------------
 
 # set version to new version
-perl -pi -e 's/project\(PGROUTING VERSION (.*)$/project\(PGROUTING VERSION '${VERSION}'/g' CMakeLists.txt
+perl -pi -e 's/project\(PGROUTING VERSION (.*)$/project\(PGROUTING VERSION '"${VERSION}"'/g' CMakeLists.txt
 
 # set PGROUTING_VERSION_DEV to "-dev"
-perl -pi -e 's/set\(PGROUTING_VERSION_DEV(.*)$/set\(PGROUTING_VERSION_DEV "'${KIND}'"\)/g'  CMakeLists.txt
+perl -pi -e 's/set\(PGROUTING_VERSION_DEV(.*)$/set\(PGROUTING_VERSION_DEV "'"${KIND}"'"\)/g'  CMakeLists.txt
 
 # --------------------------------------------
 # --------------------------------------------
@@ -42,30 +42,30 @@ perl -pi -e 's/set\(PGROUTING_VERSION_DEV(.*)$/set\(PGROUTING_VERSION_DEV "'${KI
 
 cp -f "sql/sigs/pgrouting--${OLD_VERSION}.sig" "sql/sigs/pgrouting--${VERSION}.sig"
 ls "sql/sigs/pgrouting--${VERSION}.sig"
-perl -pi -e 's/#VERSION pgrouting (.*)/#VERSION pgrouting '${VERSION}'/g' "sql/sigs/pgrouting--${VERSION}.sig"
+perl -pi -e 's/#VERSION pgrouting (.*)/#VERSION pgrouting '"${VERSION}"'/g' "sql/sigs/pgrouting--${VERSION}.sig"
 git add "sql/sigs/pgrouting--${VERSION}.sig"
 
 # --------------------------------------------
 # Include file in CMakeLists.txt
 # --------------------------------------------
 
-perl -pi -e 's/SET\(OLD_SIGNATURES/SET\(OLD_SIGNATURES\n    '${OLD_VERSION}'/g' sql/sigs/CMakeLists.txt
+perl -pi -e 's/SET\(OLD_SIGNATURES/SET\(OLD_SIGNATURES\n    '"${OLD_VERSION}"'/g' sql/sigs/CMakeLists.txt
 
 
 #if ! grep "my \$version_${MAYOR}_${MINOR} = qr" sql/scripts/build-extension-update-files1.pl
-perl -pi -e 's/# add minor here/my \$version_'${MAYOR}'_'${MINOR}' = qr\/\('${MAYOR}'\.'${MINOR}'\.\[\\d\+\]\)\/;\n# add minor here/g' sql/scripts/build-extension-update-files1.pl
-perl -pi -e 's/my \$current = (.*)$/my \$current = \$version_'${MAYOR}'\_'${MINOR}';/g' sql/scripts/build-extension-update-files1.pl
-perl -pi -e 's/unless \$old_version =~ (.*)\/;$/unless \$old_version =~ $1|\$version_'${MAYOR}'_'${MINOR}'\/;/g' sql/scripts/build-extension-update-files1.pl
+perl -pi -e 's/# add minor here/my \$version_'"${MAYOR}"'_'"${MINOR}"' = qr\/\('"${MAYOR}"'\.'"${MINOR}"'\.\[\\d\+\]\)\/;\n# add minor here/g' sql/scripts/build-extension-update-files1.pl
+perl -pi -e 's/my \$current = (.*)$/my \$current = \$version_'"${MAYOR}"'\_'"${MINOR}"';/g' sql/scripts/build-extension-update-files1.pl
+perl -pi -e 's/unless \$old_version =~ (.*)\/;$/unless \$old_version =~ $1|\$version_'"${MAYOR}"'_'"${MINOR}"'\/;/g' sql/scripts/build-extension-update-files1.pl
 
 
 # --------------------------------------------
 # Adding section in release notes & news
 # --------------------------------------------
-perl -pi -e 's/(\* :ref:`changelog_'${U_OLD_VERSION}'`)$/\* :ref:`changelog_'${U_VERSION}'`\n$1/g' doc/src/release_notes.rst
-perl -pi -e 's/(\.\. _changelog_'${U_OLD_VERSION}':)$/
-.. _changelog_'${U_VERSION}':
+perl -pi -e 's/(\* :ref:`changelog_'"${U_OLD_VERSION}"'`)$/\* :ref:`changelog_'"${U_VERSION}"'`\n$1/g' doc/src/release_notes.rst
+perl -pi -e 's/(\.\. _changelog_'"${U_OLD_VERSION}"':)$/
+.. _changelog_'"${U_VERSION}"':
 
-pgRouting '${VERSION}' Release Notes
+pgRouting '"${VERSION}"' Release Notes
 -------------------------------------------------------------------------------
 
 No Changes Yet
@@ -80,5 +80,4 @@ tools/release-scripts/notes2news.pl
 # Change return values of version
 # --------------------------------------------
 
-perl -pi -e 's/'${OLD_VERSION}'/'${VERSION}'/g' docqueries/version/*.result
-
+perl -pi -e 's/'"${OLD_VERSION}"'/'"${VERSION}"'/g' docqueries/version/*.result
diff --git a/tools/scripts/test_shell.sh b/tools/scripts/test_shell.sh
index d6a9575c5e4..418ae9b1bc7 100755
--- a/tools/scripts/test_shell.sh
+++ b/tools/scripts/test_shell.sh
@@ -6,11 +6,21 @@
 DIR=$(git rev-parse --show-toplevel)
 
 pushd "${DIR}" > /dev/null || exit
-read -ra files < <(git ls-files | grep '\.sh')
+code="0"
 
-result=$(shellcheck "${files[@]}")
-if [[ $result ]]; then
-  echo "$result"
-  echo " *** shellcheck found script errors"
-  exit 1
-fi
+for f in $(git ls-files | grep '\.sh')
+do
+  if [ "${f}" = "tools/developer/addNewVersionLink.sh" ] ; then
+    result=$(shellcheck --exclude=SC2046,SC2016 "${f}")
+  else
+    result=$(shellcheck "${f}")
+  fi
+
+  if [[ $result ]]; then
+    echo "$result"
+    echo " *** shellcheck found script errors while processing $f"
+    code=1
+  fi
+done
+popd || exit 1
+exit $code
diff --git a/tools/scripts/test_signatures.sh b/tools/scripts/test_signatures.sh
index b9ace604e01..5b621ee9119 100755
--- a/tools/scripts/test_signatures.sh
+++ b/tools/scripts/test_signatures.sh
@@ -6,10 +6,11 @@
 DIR=$(git rev-parse --show-toplevel)/sql/sigs
 
 pushd "${DIR}" > /dev/null || exit
-SIGNATURES=$(git ls-files *.sig | perl -pe 's/pgrouting--(.*)\.sig/$1/')
-for s1 in ${SIGNATURES[@]}
+SIGNATURES=$(git ls-files "*.sig" | perl -pe 's/pgrouting--(.*)\.sig/$1/')
+
+for s1 in "${SIGNATURES[@]}"
 do
-    for s2 in ${SIGNATURES[@]}
+    for s2 in "${SIGNATURES[@]}"
     do
         # only comparing lower version with higher version
         if (( $(echo "$s1 >= $s2" | bc -l) )); then continue; fi
diff --git a/tools/transifex/remove_obsolete_entries.sh b/tools/transifex/remove_obsolete_entries.sh
index 127ddbb4a01..de6cb357ba9 100755
--- a/tools/transifex/remove_obsolete_entries.sh
+++ b/tools/transifex/remove_obsolete_entries.sh
@@ -7,10 +7,9 @@
 # ------------------------------------------------------------------------------
 
 # For all the chapter files
-for file in $(find locale/en -type f -name "*.po"); do
-    if grep -q '#~' $file; then
-        perl -pi -0777 -e 's/#~.*//s' $file
-        git add $file
+find locale/en -type f -name '*.po' -exec sh -c '
+    if grep -q "#~" "$1"; then
+        perl -pi -0777 -e "s/#~.*//s" "$1"
+        git add "$1"
     fi
-done
-
+  ' sh {} \;