svc/sdr.{ba,z}sh: (still) fix prefix slash (/)

tokiclover · Oct 13, 2014 · 88a4c19 · 88a4c19
1 parent b5acc36
commit 88a4c19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/svc/sdr.bash b/svc/sdr.bash
@@ -215,7 +215,8 @@ grep -q squashfs /proc/filesystems ||
 	die "failed to initialize squashfs kernel module, exiting"
 
 for dir in ${opts[-dir]//:/ }; do
-	base="${opts[-root]}/${dir}"
+	[[ "${dir#/}" == "${dir}" ]] && dir="/${dir}"
+	base="${opts[-root]}${dir}"
 
 	if [[ -e ${base}.squashfs ]]; then
 		if (( ${opts[-offset]} != 0 )); then

diff --git a/svc/sdr.zsh b/svc/sdr.zsh
@@ -209,7 +209,8 @@ grep -q squashfs /proc/filesystems ||
 	die "failed to initialize squashfs kernel module, exiting"
 
 for dir (${(pws,:,)opts[-dir]}) {
-	base=${opts[-root]}/${dir}
+	[[ ${dir#/} == ${dir} ]] && dir=/${dir}
+	base=${opts[-root]}${dir}
 
 	if [[ -e ${base}.squashfs ]]; then
 		if (( ${opts[-offset]} != 0 )); then