Try to protect against paths with unusual characters

joelpurra · Jul 25, 2014 · 5c8dd62 · 5c8dd62
1 parent 090d5aa
commit 5c8dd62
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/domains/latest/all.sh b/src/domains/latest/all.sh
@@ -3,15 +3,15 @@ set -e
 
 domainroot="${1%/}"
 domainroot="${domainroot:-$PWD}"
-domainroot=$(cd "$domainroot"; echo "$PWD")
+domainroot=$(cd -- "$domainroot"; echo "$PWD")
 
-domainpaths=$(find "$domainroot" -type d ! -path "$domainroot")
-
-for domainpath in $domainpaths;
-do
+# http://mywiki.wooledge.org/BashFAQ/020
+# Bash
+unset a i
+while IFS= read -r -d '' domainpath; do
 	newest=$("${BASH_SOURCE%/*}/single.sh" "$domainpath")
 
 	if [[ -e "$newest" ]]; then
 		echo "$newest"
 	fi
-done
+done < <(find "$domainroot" -type d -print0 ! -path "$domainroot")
diff --git a/src/domains/latest/single.sh b/src/domains/latest/single.sh
@@ -3,9 +3,9 @@ set -e
 
 domainpath="${1%/}"
 domainpath="${domainpath:-$PWD}"
-domainpath=$(cd "$domainpath"; echo "$PWD")
+domainpath=$(cd -- "$domainpath"; echo "$PWD")
 
-newest=$(find "$domainpath" -type f -name '*.har' | sort | tail -1)
+newest=$(find "$domainpath" -type f -name '*.har' -print0 | sort -z | tail -1)
 
 if [[ -e "$newest" ]]; then
 	echo "$newest"

diff --git a/src/one-shot/data.sh b/src/one-shot/data.sh
@@ -3,7 +3,7 @@ set -e
 
 domainroot="${1%/}"
 domainroot="${domainroot:-$PWD}"
-domainroot=$(cd "$domainroot"; echo "$PWD")
+domainroot=$(cd -- "$domainroot"; echo "$PWD")
 
 # Get a list of the most recently downloaded domains
 "${BASH_SOURCE%/*}/../domains/latest/all.sh" "$domainroot" > "domains.latest.txt"